diff options
| author | Linus Torvalds | 2014-11-12 13:53:55 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2014-11-12 13:53:55 -0800 |
| commit | 9d1f9c73dfcccca7de4a9fdaec40c60c4e5497a4 (patch) | |
| tree | 439e34fb60b1eb200974d46da267432ad4b3d44f | |
| parent | de34b81bc2d034c9ba8d6b276725f975e728270a (diff) | |
| parent | 3438cf549d2f3ee8e52c82acc8e2a9710ac21a5b (diff) | |
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull kernel argument parsing fix from Rusty Russell:
"Nasty, stupid bug, and I've suddenly had two reports"
* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
param: fix crash on bad kernel arguments
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 800a0daede7e..321d0ceb26d3 100644 --- a/init/main.c +++ b/init/main.c @@ -544,7 +544,7 @@ asmlinkage __visible void __init start_kernel(void) static_command_line, __start___param, __stop___param - __start___param, -1, -1, &unknown_bootoption); - if (after_dashes) + if (!IS_ERR_OR_NULL(after_dashes)) parse_args("Setting init args", after_dashes, NULL, 0, -1, -1, set_init_arg); |