summaryrefslogtreecommitdiff
path: root/init/main.c
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2017-02-28 01:28:12 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-28 05:43:46 +0300
commit08865514805d2de8e7002fa8149c5de3e391f412 (patch)
treef366ebfda75357b9408688ce477bd2097a7cc6f3 /init/main.c
parent7bcae82621df080a35cb5e708ef333a821effd96 (diff)
downloadlinux-08865514805d2de8e7002fa8149c5de3e391f412.tar.xz
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: http://lkml.kernel.org/r/20170201140540.22051-1-lokeshvutla@ti.com Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reported-by: Murali Karicheri <m-karicheri2@ti.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Tero Kristo <t-kristo@ti.com> Cc: Sekhar Nori <nsekhar@ti.com> Cc: Nishanth Menon <nm@ti.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r--init/main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/init/main.c b/init/main.c
index 24ea48745061..6eb10ce472b9 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;
numa_default_policy();
- flush_delayed_fput();
-
rcu_end_inkernel_boot();
if (ramdisk_execute_command) {