Skip to content

Commit 0886551

Browse files
lokeshvutlatorvalds
authored andcommitted
initramfs: finish fput() before accessing any binary from initramfs
Commit 4a9d4b0 ("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>
1 parent 7bcae82 commit 0886551

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

init/initramfs.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <linux/dirent.h>
1919
#include <linux/syscalls.h>
2020
#include <linux/utime.h>
21+
#include <linux/file.h>
2122

2223
static ssize_t __init xwrite(int fd, const char *p, size_t count)
2324
{
@@ -647,6 +648,7 @@ static int __init populate_rootfs(void)
647648
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
648649
free_initrd();
649650
#endif
651+
flush_delayed_fput();
650652
/*
651653
* Try loading default modules from initramfs. This gives
652654
* us a chance to load before device_initcalls.

init/main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
#include <linux/shmem_fs.h>
7272
#include <linux/slab.h>
7373
#include <linux/perf_event.h>
74-
#include <linux/file.h>
7574
#include <linux/ptrace.h>
7675
#include <linux/blkdev.h>
7776
#include <linux/elevator.h>
@@ -960,8 +959,6 @@ static int __ref kernel_init(void *unused)
960959
system_state = SYSTEM_RUNNING;
961960
numa_default_policy();
962961

963-
flush_delayed_fput();
964-
965962
rcu_end_inkernel_boot();
966963

967964
if (ramdisk_execute_command) {

0 commit comments

Comments
 (0)