Skip to content

Commit

Permalink
initramfs: finish fput() before accessing any binary from initramfs
Browse files Browse the repository at this point in the history
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/[email protected]
Signed-off-by: Lokesh Vutla <[email protected]>
Reported-by: Murali Karicheri <[email protected]>
Cc: Al Viro <[email protected]>
Cc: Tero Kristo <[email protected]>
Cc: Sekhar Nori <[email protected]>
Cc: Nishanth Menon <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
lokeshvutla authored and torvalds committed Feb 28, 2017
1 parent 7bcae82 commit 0886551
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 2 additions & 0 deletions init/initramfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -647,6 +648,7 @@ static int __init populate_rootfs(void)
printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
free_initrd();
#endif
flush_delayed_fput();
/*
* Try loading default modules from initramfs. This gives
* us a chance to load before device_initcalls.
Expand Down
3 changes: 0 additions & 3 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 0886551

Please sign in to comment.