Commit 76167e5c authored by Arvind Sankar's avatar Arvind Sankar Committed by Ingo Molnar

x86/kaslr: Replace strlen() with strnlen()

strnlen is safer in case the command line is not NUL-terminated.
Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200803011534.730645-2-nivedita@alum.mit.edu
parent f49236ae
...@@ -43,6 +43,10 @@ ...@@ -43,6 +43,10 @@
#define STATIC #define STATIC
#include <linux/decompress/mm.h> #include <linux/decompress/mm.h>
#define _SETUP
#include <asm/setup.h> /* For COMMAND_LINE_SIZE */
#undef _SETUP
#ifdef CONFIG_X86_5LEVEL #ifdef CONFIG_X86_5LEVEL
unsigned int __pgtable_l5_enabled; unsigned int __pgtable_l5_enabled;
unsigned int pgdir_shift __ro_after_init = 39; unsigned int pgdir_shift __ro_after_init = 39;
...@@ -278,7 +282,7 @@ static void handle_mem_options(void) ...@@ -278,7 +282,7 @@ static void handle_mem_options(void)
if (!args) if (!args)
return; return;
len = strlen(args); len = strnlen(args, COMMAND_LINE_SIZE-1);
tmp_cmdline = malloc(len + 1); tmp_cmdline = malloc(len + 1);
if (!tmp_cmdline) if (!tmp_cmdline)
error("Failed to allocate space for tmp_cmdline"); error("Failed to allocate space for tmp_cmdline");
...@@ -425,7 +429,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size, ...@@ -425,7 +429,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size,
cmd_line = get_cmd_line_ptr(); cmd_line = get_cmd_line_ptr();
/* Calculate size of cmd_line. */ /* Calculate size of cmd_line. */
if (cmd_line) { if (cmd_line) {
cmd_line_size = strlen((char *)cmd_line) + 1; cmd_line_size = strnlen((char *)cmd_line, COMMAND_LINE_SIZE-1) + 1;
mem_avoid[MEM_AVOID_CMDLINE].start = cmd_line; mem_avoid[MEM_AVOID_CMDLINE].start = cmd_line;
mem_avoid[MEM_AVOID_CMDLINE].size = cmd_line_size; mem_avoid[MEM_AVOID_CMDLINE].size = cmd_line_size;
add_identity_map(mem_avoid[MEM_AVOID_CMDLINE].start, add_identity_map(mem_avoid[MEM_AVOID_CMDLINE].start,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment