]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
dump/win_dump: limit number of processed PRCBs
authorViktor Prutyanov <viktor.prutyanov@redhat.com>
Wed, 19 Oct 2022 23:59:48 +0000 (02:59 +0300)
committerMarc-André Lureau <marcandre.lureau@redhat.com>
Wed, 26 Oct 2022 08:55:00 +0000 (12:55 +0400)
When number of CPUs utilized by guest Windows is less than defined in
QEMU (i.e., desktop versions of Windows severely limits number of CPU
sockets), patch_and_save_context routine accesses non-existent PRCB and
fails. So, limit number of processed PRCBs by NumberProcessors taken
from guest Windows driver.

Signed-off-by: Viktor Prutyanov <viktor.prutyanov@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20221019235948.656411-1-viktor.prutyanov@redhat.com>

dump/win_dump.c

index fd91350fbb8e249d747a8e10fa709359db547c7a..f20b6051b6c8ae1e623c2a9d30ac842af864935f 100644 (file)
@@ -273,6 +273,13 @@ static void patch_and_save_context(WinDumpHeader *h, bool x64,
         uint64_t Context;
         WinContext ctx;
 
+        if (i >= WIN_DUMP_FIELD(NumberProcessors)) {
+            warn_report("win-dump: number of QEMU CPUs is bigger than"
+                        " NumberProcessors (%u) in guest Windows",
+                        WIN_DUMP_FIELD(NumberProcessors));
+            return;
+        }
+
         if (cpu_read_ptr(x64, first_cpu,
                 KiProcessorBlock + i * win_dump_ptr_size(x64),
                 &Prcb)) {