path: root/init
diff options
authorLokesh Vutla <>2017-02-27 14:28:12 -0800
committerLinus Torvalds <>2017-02-27 18:43:46 -0800
commit08865514805d2de8e7002fa8149c5de3e391f412 (patch)
treef366ebfda75357b9408688ce477bd2097a7cc6f3 /init
parent7bcae82621df080a35cb5e708ef333a821effd96 (diff)
initramfs: finish fput() before accessing any binary from initramfs
Commit 4a9d4b024a31 ("switch fput to task_work_add") implements a schedule_work() for completing fput(), but did not guarantee calling __fput() after unpacking initramfs. Because of this, there is a possibility that during boot a driver can see ETXTBSY when it tries to load a binary from initramfs as fput() is still pending on that binary. This patch makes sure that fput() is completed after unpacking initramfs and removes the call to flush_delayed_fput() in kernel_init() which happens very late after unpacking initramfs. Link: Signed-off-by: Lokesh Vutla <> Reported-by: Murali Karicheri <> Cc: Al Viro <> Cc: Tero Kristo <> Cc: Sekhar Nori <> Cc: Nishanth Menon <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'init')
2 files changed, 2 insertions, 3 deletions
diff --git a/init/initramfs.c b/init/initramfs.c
index b32ad7d..981f286 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -18,6 +18,7 @@
#include <linux/dirent.h>
#include <linux/syscalls.h>
#include <linux/utime.h>
+#include <linux/file.h>
static ssize_t __init xwrite(int fd, const char *p, size_t count)
@@ -647,6 +648,7 @@ static int __init populate_rootfs(void)
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
+ flush_delayed_fput();
* Try loading default modules from initramfs. This gives
* us a chance to load before device_initcalls.
diff --git a/init/main.c b/init/main.c
index 24ea487..6eb10ce 100644
--- a/init/main.c
+++ b/init/main.c
@@ -71,7 +71,6 @@
#include <linux/shmem_fs.h>
#include <linux/slab.h>
#include <linux/perf_event.h>
-#include <linux/file.h>
#include <linux/ptrace.h>
#include <linux/blkdev.h>
#include <linux/elevator.h>
@@ -960,8 +959,6 @@ static int __ref kernel_init(void *unused)
system_state = SYSTEM_RUNNING;
- flush_delayed_fput();
if (ramdisk_execute_command) {