]> git.proxmox.com Git - mirror_qemu.git/commitdiff
multiboot: Check validity of mh_header_addr
authorKevin Wolf <kwolf@redhat.com>
Wed, 14 Mar 2018 16:57:45 +0000 (17:57 +0100)
committerKevin Wolf <kwolf@redhat.com>
Wed, 21 Mar 2018 14:13:25 +0000 (15:13 +0100)
I couldn't find a case where this prevents something bad from happening
that isn't already caught by other checks, but let's err on the safe
side and check that mh_header_addr is as expected.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Jack Schwartz <jack.schwartz@oracle.com>
hw/i386/multiboot.c

index 1e215bf8d3833a9086b89617ca96e6b9a0d1cb92..5bc0a2cddb6dff28a55a00e506e5169d15e6ae86 100644 (file)
@@ -229,6 +229,10 @@ int load_multiboot(FWCfgState *fw_cfg,
             error_report("invalid load_addr address");
             exit(1);
         }
+        if (mh_header_addr - mh_load_addr > i) {
+            error_report("invalid header_addr address");
+            exit(1);
+        }
 
         uint32_t mb_kernel_text_offset = i - (mh_header_addr - mh_load_addr);
         uint32_t mb_load_size = 0;