init: fix possible format string bug

[android-x86/kernel.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 98e3537..f333385 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -278,7 +278,7 @@ static int __init unknown_bootoption(char *param, char *val, const char *unused)
                unsigned int i;
                for (i = 0; envp_init[i]; i++) {
                        if (i == MAX_INIT_ENVS) {
-                               panic_later = "Too many boot env vars at `%s'";
+                               panic_later = "env";
                                panic_param = param;
                        }
                        if (!strncmp(param, envp_init[i], val - param))
@@ -290,7 +290,7 @@ static int __init unknown_bootoption(char *param, char *val, const char *unused)
                unsigned int i;
                for (i = 0; argv_init[i]; i++) {
                        if (i == MAX_INIT_ARGS) {
-                               panic_later = "Too many boot init vars at `%s'";
+                               panic_later = "init";
                                panic_param = param;
                        }
                }
@@ -582,7 +582,8 @@ asmlinkage void __init start_kernel(void)
         */
        console_init();
        if (panic_later)
-               panic(panic_later, panic_param);
+               panic("Too many boot %s vars at `%s'", panic_later,
+                     panic_param);
 
        lockdep_info();