init/main.c: Fix potential static_command_line memory overflow
authorYuntao Wang <ytcoode@gmail.com>
Fri, 12 Apr 2024 08:17:32 +0000 (16:17 +0800)
committerMasami Hiramatsu (Google) <mhiramat@kernel.org>
Fri, 12 Apr 2024 15:59:36 +0000 (00:59 +0900)
commit46dad3c1e57897ab9228332f03e1c14798d2d3b9
treef6276d9113b9cdeb788722999f75cbf391b38bbc
parentc722cea208789d9e2660992bcd05fb9fac3adb56
init/main.c: Fix potential static_command_line memory overflow

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 f5c7310ac73e ("init/main: add
checks for the return value of memblock_alloc*()")

Link: https://lore.kernel.org/all/20240412081733.35925-2-ytcoode@gmail.com/
Fixes: f5c7310ac73e ("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>
init/main.c