From: Gerd Hoffmann Date: Thu, 5 Sep 2024 14:12:07 +0000 (+0200) Subject: x86/loader: only patch linux kernels X-Git-Tag: v9.1.3~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8269bdd6817a359e5a3f1e653a01010992ae7a7;p=thirdparty%2Fqemu.git x86/loader: only patch linux kernels If the binary loaded via -kernel is *not* a linux kernel (in which case protocol == 0), do not patch the linux kernel header fields. It's (a) pointless and (b) might break binaries by random patching and (c) changes the binary hash which in turn breaks secure boot verification. Background: OVMF happily loads and runs not only linux kernels but any efi binary via direct kernel boot. Note: Breaking the secure boot verification is a problem for linux kernels too, but fixed that is left for another day ... Signed-off-by: Gerd Hoffmann Message-ID: <20240905141211.1253307-3-kraxel@redhat.com> (cherry picked from commit 57e2cc9abf5da38f600354fe920ff20e719607b4) Signed-off-by: Michael Tokarev --- diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c index 992ea1f25e9..b52903c47fe 100644 --- a/hw/i386/x86-common.c +++ b/hw/i386/x86-common.c @@ -943,7 +943,7 @@ void x86_load_linux(X86MachineState *x86ms, * kernel on the other side of the fw_cfg interface matches the hash of the * file the user passed in. */ - if (!sev_enabled()) { + if (!sev_enabled() && protocol > 0) { memcpy(setup, header, MIN(sizeof(header), setup_size)); }