Skip to content

Commit 76167e5

Browse files
nivedita76Ingo Molnar
authored andcommitted
x86/kaslr: Replace strlen() with strnlen()
strnlen is safer in case the command line is not NUL-terminated. Signed-off-by: Arvind Sankar <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f49236a commit 76167e5

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

arch/x86/boot/compressed/kaslr.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
#define STATIC
4444
#include <linux/decompress/mm.h>
4545

46+
#define _SETUP
47+
#include <asm/setup.h> /* For COMMAND_LINE_SIZE */
48+
#undef _SETUP
49+
4650
#ifdef CONFIG_X86_5LEVEL
4751
unsigned int __pgtable_l5_enabled;
4852
unsigned int pgdir_shift __ro_after_init = 39;
@@ -278,7 +282,7 @@ static void handle_mem_options(void)
278282
if (!args)
279283
return;
280284

281-
len = strlen(args);
285+
len = strnlen(args, COMMAND_LINE_SIZE-1);
282286
tmp_cmdline = malloc(len + 1);
283287
if (!tmp_cmdline)
284288
error("Failed to allocate space for tmp_cmdline");
@@ -425,7 +429,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size,
425429
cmd_line = get_cmd_line_ptr();
426430
/* Calculate size of cmd_line. */
427431
if (cmd_line) {
428-
cmd_line_size = strlen((char *)cmd_line) + 1;
432+
cmd_line_size = strnlen((char *)cmd_line, COMMAND_LINE_SIZE-1) + 1;
429433
mem_avoid[MEM_AVOID_CMDLINE].start = cmd_line;
430434
mem_avoid[MEM_AVOID_CMDLINE].size = cmd_line_size;
431435
add_identity_map(mem_avoid[MEM_AVOID_CMDLINE].start,

0 commit comments

Comments
 (0)