提交 499a4584 编写于 作者: T Tetsuo Handa 提交者: Linus Torvalds

init: fix possible format string bug

Use constant format string in case message changes.
Signed-off-by: NTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 128e3f45
......@@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
{
char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
if (err)
panic(err); /* Failed to decompress INTERNAL initramfs */
panic("%s", err); /* Failed to decompress INTERNAL initramfs */
if (initrd_start) {
#ifdef CONFIG_BLK_DEV_RAM
int fd;
......
......@@ -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();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册