Skip to content

Commit 499a458

Browse files
Tetsuo Handatorvalds
authored andcommitted
init: fix possible format string bug
Use constant format string in case message changes. Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 128e3f4 commit 499a458

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

init/initramfs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ static int __init populate_rootfs(void)
583583
{
584584
char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
585585
if (err)
586-
panic(err); /* Failed to decompress INTERNAL initramfs */
586+
panic("%s", err); /* Failed to decompress INTERNAL initramfs */
587587
if (initrd_start) {
588588
#ifdef CONFIG_BLK_DEV_RAM
589589
int fd;

init/main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ static int __init unknown_bootoption(char *param, char *val, const char *unused)
278278
unsigned int i;
279279
for (i = 0; envp_init[i]; i++) {
280280
if (i == MAX_INIT_ENVS) {
281-
panic_later = "Too many boot env vars at `%s'";
281+
panic_later = "env";
282282
panic_param = param;
283283
}
284284
if (!strncmp(param, envp_init[i], val - param))
@@ -290,7 +290,7 @@ static int __init unknown_bootoption(char *param, char *val, const char *unused)
290290
unsigned int i;
291291
for (i = 0; argv_init[i]; i++) {
292292
if (i == MAX_INIT_ARGS) {
293-
panic_later = "Too many boot init vars at `%s'";
293+
panic_later = "init";
294294
panic_param = param;
295295
}
296296
}
@@ -582,7 +582,8 @@ asmlinkage void __init start_kernel(void)
582582
*/
583583
console_init();
584584
if (panic_later)
585-
panic(panic_later, panic_param);
585+
panic("Too many boot %s vars at `%s'", panic_later,
586+
panic_param);
586587

587588
lockdep_info();
588589

0 commit comments

Comments
 (0)