From: Thomas Huth Date: Wed, 25 Sep 2019 12:16:43 +0000 (+0200) Subject: hw/core/loader: Fix possible crash in rom_copy() X-Git-Tag: v4.0.1~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f1c6cb2f9afafda05eab150fd2bd284edce6676;p=thirdparty%2Fqemu.git hw/core/loader: Fix possible crash in rom_copy() Both, "rom->addr" and "addr" are derived from the binary image that can be loaded with the "-kernel" paramer. The code in rom_copy() then calculates: d = dest + (rom->addr - addr); and uses "d" as destination in a memcpy() some lines later. Now with bad kernel images, it is possible that rom->addr is smaller than addr, thus "rom->addr - addr" gets negative and the memcpy() then tries to copy contents from the image to a bad memory location. This could maybe be used to inject code from a kernel image into the QEMU binary, so we better fix it with an additional sanity check here. Cc: qemu-stable@nongnu.org Reported-by: Guangming Liu Buglink: https://bugs.launchpad.net/qemu/+bug/1844635 Message-Id: <20190925130331.27825-1-thuth@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Thomas Huth (cherry picked from commit e423455c4f23a1a828901c78fe6d03b7dde79319) Signed-off-by: Michael Roth --- diff --git a/hw/core/loader.c b/hw/core/loader.c index fe5cb241225..4ef20952471 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -1240,7 +1240,7 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) if (rom->addr + rom->romsize < addr) { continue; } - if (rom->addr > end) { + if (rom->addr > end || rom->addr < addr) { break; }