This is a note to let you know that I've just added the patch titled bootconfig: Extend the magic check range to the preceding 3 bytes to the 5.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: bootconfig-extend-the-magic-check-range-to-the-preceding-3-bytes.patch and it can be found in the queue-5.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 50b8a742850fce7293bed45753152c425f7e931b Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu <mhiramat@xxxxxxxxxx> Date: Fri, 13 Nov 2020 02:27:31 +0900 Subject: bootconfig: Extend the magic check range to the preceding 3 bytes From: Masami Hiramatsu <mhiramat@xxxxxxxxxx> commit 50b8a742850fce7293bed45753152c425f7e931b upstream. Since Grub may align the size of initrd to 4 if user pass initrd from cpio, we have to check the preceding 3 bytes as well. Link: https://lkml.kernel.org/r/160520205132.303174.4876760192433315429.stgit@devnote2 Cc: stable@xxxxxxxxxxxxxxx Fixes: 85c46b78da58 ("bootconfig: Add bootconfig magic word for indicating bootconfig explicitly") Reported-by: Chen Yu <yu.chen.surf@xxxxxxxxx> Tested-by: Chen Yu <yu.chen.surf@xxxxxxxxx> Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx> Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- init/main.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) --- a/init/main.c +++ b/init/main.c @@ -267,14 +267,24 @@ static void * __init get_boot_config_fro u32 size, csum; char *data; u32 *hdr; + int i; if (!initrd_end) return NULL; data = (char *)initrd_end - BOOTCONFIG_MAGIC_LEN; - if (memcmp(data, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN)) - return NULL; + /* + * Since Grub may align the size of initrd to 4, we must + * check the preceding 3 bytes as well. + */ + for (i = 0; i < 4; i++) { + if (!memcmp(data, BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_LEN)) + goto found; + data--; + } + return NULL; +found: hdr = (u32 *)(data - 8); size = hdr[0]; csum = hdr[1]; Patches currently in stable-queue which might be from mhiramat@xxxxxxxxxx are queue-5.9/selftests-ftrace-check-for-do_sys_openat2-in-user-me.patch queue-5.9/arm-9019-1-kprobes-avoid-fortify_panic-when-copying-.patch queue-5.9/bootconfig-extend-the-magic-check-range-to-the-preceding-3-bytes.patch