Subject: [merged] init-fix-possible-format-string-bug.patch removed from -mm tree
To: penguin-kernel@xxxxxxxxxxxxxxxxxxx,penguin-kernel@xxxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 24 Jan 2014 11:02:14 -0800
The patch titled
Subject: init: fix possible format string bug
has been removed from the -mm tree. Its filename was
init-fix-possible-format-string-bug.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Subject: init: fix possible format string bug
Use constant format string in case message changes.
Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
init/initramfs.c | 2 +-
init/main.c | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff -puN init/initramfs.c~init-fix-possible-format-string-bug init/initramfs.c
--- a/init/initramfs.c~init-fix-possible-format-string-bug
+++ a/init/initramfs.c
@@ -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;
diff -puN init/main.c~init-fix-possible-format-string-bug init/main.c
--- a/init/main.c~init-fix-possible-format-string-bug
+++ a/init/main.c
@@ -278,7 +278,7 @@ static int __init unknown_bootoption(cha
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(cha
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();
_
Patches currently in -mm which might be from penguin-kernel@xxxxxxxxxxxxxxxxxxx are
origin.patch
lib-vsprintf-add-%pt-format-specifier.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
