Commit e2ee6173 authored by Arvind Sankar's avatar Arvind Sankar Committed by Ingo Molnar

x86/kaslr: Remove bogus warning and unnecessary goto

Drop the warning on seeing "--" in handle_mem_options(). This will trigger
whenever one of the memory options is present in the command line
together with "--", but there's no problem if that is the case.

Replace goto with break.
Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/20200727230801.3468620-3-nivedita@alum.mit.edu
parent 709709ac
...@@ -295,10 +295,8 @@ static void handle_mem_options(void) ...@@ -295,10 +295,8 @@ static void handle_mem_options(void)
while (*args) { while (*args) {
args = next_arg(args, &param, &val); args = next_arg(args, &param, &val);
/* Stop at -- */ /* Stop at -- */
if (!val && strcmp(param, "--") == 0) { if (!val && strcmp(param, "--") == 0)
warn("Only '--' specified in cmdline"); break;
goto out;
}
if (!strcmp(param, "memmap")) { if (!strcmp(param, "memmap")) {
mem_avoid_memmap(PARSE_MEMMAP, val); mem_avoid_memmap(PARSE_MEMMAP, val);
...@@ -311,7 +309,7 @@ static void handle_mem_options(void) ...@@ -311,7 +309,7 @@ static void handle_mem_options(void)
continue; continue;
mem_size = memparse(p, &p); mem_size = memparse(p, &p);
if (mem_size == 0) if (mem_size == 0)
goto out; break;
mem_limit = mem_size; mem_limit = mem_size;
} else if (!strcmp(param, "efi_fake_mem")) { } else if (!strcmp(param, "efi_fake_mem")) {
...@@ -319,7 +317,6 @@ static void handle_mem_options(void) ...@@ -319,7 +317,6 @@ static void handle_mem_options(void)
} }
} }
out:
free(tmp_cmdline); free(tmp_cmdline);
return; return;
} }
......
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