initramfs: cleanup incomplete rootfs

dengraf · torvalds · commit ff1522bb7d98 · 2019-01-04T13:13:47.000-08:00
Unpacking an external initrd may fail e.g. not enough memory. This leads to an incomplete rootfs because some files might be extracted already. Fixed by cleaning the rootfs so the kernel is not using an incomplete rootfs. Link: http://lkml.kernel.org/r/20181030151805.5519-1-david.engraf@sysgo.com Signed-off-by: David Engraf <david.engraf@sysgo.com> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Philippe Ombredanne <pombredanne@nexb.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/init/initramfs.c b/init/initramfs.c
@@ -550,7 +550,6 @@ static void __init free_initrd(void)
 	initrd_end = 0;
 }
 
-#ifdef CONFIG_BLK_DEV_RAM
 #define BUF_SIZE 1024
 static void __init clean_rootfs(void)
 {
@@ -597,7 +596,6 @@ static void __init clean_rootfs(void)
 	ksys_close(fd);
 	kfree(buf);
 }
-#endif
 
 static int __init populate_rootfs(void)
 {
@@ -640,8 +638,10 @@ static int __init populate_rootfs(void)
 		printk(KERN_INFO "Unpacking initramfs...\n");
 		err = unpack_to_rootfs((char *)initrd_start,
 			initrd_end - initrd_start);
-		if (err)
+		if (err) {
 			printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
+			clean_rootfs();
+		}
 		free_initrd();
 #endif
 	}

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,6 @@ static void __init free_initrd(void)`
`550`	`550`	`initrd_end = 0;`
`551`	`551`	`}`
`552`	`552`
`553`		`-#ifdef CONFIG_BLK_DEV_RAM`
`554`	`553`	`#define BUF_SIZE 1024`
`555`	`554`	`static void __init clean_rootfs(void)`
`556`	`555`	`{`
`@@ -597,7 +596,6 @@ static void __init clean_rootfs(void)`
`597`	`596`	`ksys_close(fd);`
`598`	`597`	`kfree(buf);`
`599`	`598`	`}`
`600`		`-#endif`
`601`	`599`
`602`	`600`	`static int __init populate_rootfs(void)`
`603`	`601`	`{`
`@@ -640,8 +638,10 @@ static int __init populate_rootfs(void)`
`640`	`638`	`printk(KERN_INFO "Unpacking initramfs...\n");`
`641`	`639`	`err = unpack_to_rootfs((char *)initrd_start,`
`642`	`640`	`initrd_end - initrd_start);`
`643`		`- if (err)`
	`641`	`+ if (err) {`
`644`	`642`	`printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);`
	`643`	`+ clean_rootfs();`
	`644`	`+ }`
`645`	`645`	`free_initrd();`
`646`	`646`	`#endif`
`647`	`647`	`}`