diff options
| author | Yuntao Wang <ytcoode@gmail.com> | 2024-04-12 16:17:32 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-27 17:13:02 +0200 |
| commit | 936a02b5a9630c5beb0353c3085cc49d86c57034 (patch) | |
| tree | 9ac657e333384049220a9effa109cb1d18371cbc | |
| parent | 022b19ebc31cce369c407617041a3db810db23b3 (diff) | |
| download | linux-stable-936a02b5a9630c5beb0353c3085cc49d86c57034.tar.gz linux-stable-936a02b5a9630c5beb0353c3085cc49d86c57034.tar.bz2 linux-stable-936a02b5a9630c5beb0353c3085cc49d86c57034.zip | |
init/main.c: Fix potential static_command_line memory overflow
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 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 98fdd93d79a5..b06bb72a288a 100644 --- a/init/main.c +++ b/init/main.c @@ -635,6 +635,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); |