[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] x86/loader: only patch linux kernels
From: |
Gerd Hoffmann |
Subject: |
[PULL 2/5] x86/loader: only patch linux kernels |
Date: |
Thu, 14 Nov 2024 12:00:58 +0100 |
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 <kraxel@redhat.com>
Message-ID: <20240905141211.1253307-3-kraxel@redhat.com>
---
hw/i386/x86-common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/i386/x86-common.c b/hw/i386/x86-common.c
index bc360a9ea44b..ee047308331a 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));
}
--
2.47.0
- [PULL 0/5] Firmware 20241114 patches, Gerd Hoffmann, 2024/11/14
- [PULL 1/5] vl: fix qemu_validate_options() indention, Gerd Hoffmann, 2024/11/14
- [PULL 3/5] x86/loader: read complete kernel, Gerd Hoffmann, 2024/11/14
- [PULL 2/5] x86/loader: only patch linux kernels,
Gerd Hoffmann <=
- [PULL 5/5] x86/loader: add -shim option, Gerd Hoffmann, 2024/11/14
- [PULL 4/5] x86/loader: expose unpatched kernel, Gerd Hoffmann, 2024/11/14
- Re: [PULL 0/5] Firmware 20241114 patches, Daniel P . Berrangé, 2024/11/14