diff --git a/[refs] b/[refs] index bdc64a4edacb..9e42c0ec2e21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32ef43848f283e0ef945d3c67e851c143fea3970 +refs/heads/master: 808bf29b9195c52239b9aaeda7c6082a0ddf07c6 diff --git a/trunk/init/main.c b/trunk/init/main.c index 9c51ee7adf3d..2a9b88aa5e76 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -209,8 +209,19 @@ early_param("quiet", quiet_kernel); static int __init loglevel(char *str) { - get_option(&str, &console_loglevel); - return 0; + int newlevel; + + /* + * Only update loglevel value when a correct setting was passed, + * to prevent blind crashes (when loglevel being set to 0) that + * are quite hard to debug + */ + if (get_option(&str, &newlevel)) { + console_loglevel = newlevel; + return 0; + } + + return -EINVAL; } early_param("loglevel", loglevel);