linux-stable/init
Yuntao Wang 76c2f4d426 init/main.c: Fix potential static_command_line memory overflow
commit 46dad3c1e5 upstream.

We allocate memory of size 'xlen + strlen(boot_command_line) + 1' for
static_command_line, but the strings copied into static_command_line are
extra_command_line and command_line, rather than extra_command_line and
boot_command_line.

When strlen(command_line) > strlen(boot_command_line), static_command_line
will overflow.

This patch just recovers strlen(command_line) which was miss-consolidated
with strlen(boot_command_line) in the commit f5c7310ac7 ("init/main: add
checks for the return value of memblock_alloc*()")

Link: https://lore.kernel.org/all/20240412081733.35925-2-ytcoode@gmail.com/

Fixes: f5c7310ac7 ("init/main: add checks for the return value of memblock_alloc*()")
Cc: stable@vger.kernel.org
Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2024-04-27 17:07:16 +02:00
..
.gitignore kbuild: build init/built-in.a just once 2022-09-29 04:40:15 +09:00
Kconfig init/Kconfig: lower GCC version check for -Warray-bounds 2024-04-03 15:19:40 +02:00
Makefile kbuild: generate include/generated/compile.h in top Makefile 2022-09-29 04:40:15 +09:00
build-version kbuild: build init/built-in.a just once 2022-09-29 04:40:15 +09:00
calibrate.c
do_mounts.c rootfs: Fix support for rootfstype= when root= is given 2024-01-25 15:27:43 -08:00
do_mounts.h init: add an init_mknod helper 2020-07-31 08:17:54 +02:00
do_mounts_initrd.c freezer,umh: Clean up freezer/initrd interaction 2022-09-07 21:53:48 +02:00
do_mounts_rd.c init: add an init_unlink helper 2020-07-31 08:17:52 +02:00
init_task.c rcu-tasks: Add data structures for lightweight grace periods 2022-06-20 09:22:28 -07:00
initramfs.c init: open /initrd.image with O_LARGEFILE 2024-04-03 15:19:47 +02:00
main.c init/main.c: Fix potential static_command_line memory overflow 2024-04-27 17:07:16 +02:00
noinitramfs.c init: move usermodehelper_enable() to populate_rootfs() 2021-09-08 11:50:27 -07:00
version-timestamp.c kbuild: build init/built-in.a just once 2022-09-29 04:40:15 +09:00
version.c kbuild: build init/built-in.a just once 2022-09-29 04:40:15 +09:00