Commit 227f52a4 authored by Vasily Gorbik's avatar Vasily Gorbik

s390/startup: correct command line options parsing

Check val is not NULL before accessing it. This might happen if
corresponding kernel command line options are used without specifying
values.
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent a45425d8
...@@ -223,12 +223,12 @@ void parse_boot_command_line(void) ...@@ -223,12 +223,12 @@ void parse_boot_command_line(void)
while (*args) { while (*args) {
args = next_arg(args, &param, &val); args = next_arg(args, &param, &val);
if (!strcmp(param, "mem")) { if (!strcmp(param, "mem") && val) {
memory_end = round_down(memparse(val, NULL), PAGE_SIZE); memory_end = round_down(memparse(val, NULL), PAGE_SIZE);
memory_end_set = 1; memory_end_set = 1;
} }
if (!strcmp(param, "vmalloc")) if (!strcmp(param, "vmalloc") && val)
vmalloc_size = round_up(memparse(val, NULL), PAGE_SIZE); vmalloc_size = round_up(memparse(val, NULL), PAGE_SIZE);
if (!strcmp(param, "noexec")) { if (!strcmp(param, "noexec")) {
...@@ -237,7 +237,7 @@ void parse_boot_command_line(void) ...@@ -237,7 +237,7 @@ void parse_boot_command_line(void)
noexec_disabled = 1; noexec_disabled = 1;
} }
if (!strcmp(param, "facilities")) if (!strcmp(param, "facilities") && val)
modify_fac_list(val); modify_fac_list(val);
if (!strcmp(param, "nokaslr")) if (!strcmp(param, "nokaslr"))
......
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