Commit dc42e850 authored by Yuntao Wang's avatar Yuntao Wang Committed by Guo Mengqi
Browse files

init/main.c: Fix potential static_command_line memory overflow 

stable inclusion
from stable-v5.10.216
commit 2ef607ea103616aec0289f1b65d103d499fa903a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9L5HF
CVE: CVE-2024-26988

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2ef607ea103616aec0289f1b65d103d499fa903a

--------------------------------

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

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



Fixes: f5c7310a ("init/main: add checks for the return value of memblock_alloc*()")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarYuntao Wang <ytcoode@gmail.com>
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarHuang Xiaojia <huangxiaojia2@huawei.com>
parent ccd2a609

init/main.c

+2 −0
Original line number Diff line number Diff line
@@ -633,6 +633,8 @@ static void __init setup_command_line(char *command_line) 
	if (!saved_command_line)

		panic("%s: Failed to allocate %zu bytes\n", __func__, len + ilen);



	len = xlen + strlen(command_line) + 1;



	static_command_line = memblock_alloc(len, SMP_CACHE_BYTES);

	if (!static_command_line)

		panic("%s: Failed to allocate %zu bytes\n", __func__, len);