[PATCH 03/12] x86: zimage: Sanity-check the kernel version before printing it
Simon Glass
sjg at chromium.org
Mon Sep 28 02:46:15 CEST 2020
With Chrome OS the kernel setup block is stored in a separate place from
the kernel, so it is not possible to access the kernel version string.
At present, garbage is printed.
Add a sanity check to avoid this.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
arch/x86/lib/zimage.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c
index 7418c9a5fed..d425ded596d 100644
--- a/arch/x86/lib/zimage.c
+++ b/arch/x86/lib/zimage.c
@@ -31,6 +31,7 @@
#include <asm/arch/timestamp.h>
#endif
#include <linux/compiler.h>
+#include <linux/ctype.h>
#include <linux/libfdt.h>
/*
@@ -175,11 +176,19 @@ static const char *get_kernel_version(struct boot_params *params,
{
struct setup_header *hdr = ¶ms->hdr;
int bootproto;
+ const char *s, *end;
bootproto = get_boot_protocol(hdr, false);
if (bootproto < 0x0200 || hdr->setup_sects < 15)
return NULL;
+ /* sanity-check the kernel version in case it is missing */
+ for (s = kernel_base + hdr->kernel_version + 0x200, end = s + 0x100; *s;
+ s++) {
+ if (!isprint(*s))
+ return NULL;
+ }
+
return kernel_base + hdr->kernel_version + 0x200;
}
--
2.28.0.681.g6f77f65b4e-goog
More information about the U-Boot
mailing list