From: akpm@linux-foundation.org
To: lokeshvutla@ti.com, m-karicheri2@ti.com, nm@ti.com,
nsekhar@ti.com, t-kristo@ti.com, viro@zeniv.linux.org.uk,
mm-commits@vger.kernel.org
Subject: [merged] initramfs-finish-fput-before-accessing-any-binary-from-initramfs.patch removed from -mm tree
Date: Tue, 28 Feb 2017 12:50:39 -0800 [thread overview]
Message-ID: <58b5e29f.ntc2TpbtbQUcTnYU%akpm@linux-foundation.org> (raw)
The patch titled
Subject: initramfs: finish fput() before accessing any binary from initramfs
has been removed from the -mm tree. Its filename was
initramfs-finish-fput-before-accessing-any-binary-from-initramfs.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Lokesh Vutla <lokeshvutla@ti.com>
Subject: 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>
---
init/initramfs.c | 2 ++
init/main.c | 3 ---
2 files changed, 2 insertions(+), 3 deletions(-)
diff -puN init/initramfs.c~initramfs-finish-fput-before-accessing-any-binary-from-initramfs init/initramfs.c
--- a/init/initramfs.c~initramfs-finish-fput-before-accessing-any-binary-from-initramfs
+++ a/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);
free_initrd();
#endif
+ flush_delayed_fput();
/*
* Try loading default modules from initramfs. This gives
* us a chance to load before device_initcalls.
diff -puN init/main.c~initramfs-finish-fput-before-accessing-any-binary-from-initramfs init/main.c
--- a/init/main.c~initramfs-finish-fput-before-accessing-any-binary-from-initramfs
+++ a/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 *unuse
system_state = SYSTEM_RUNNING;
numa_default_policy();
- flush_delayed_fput();
reply other threads:[~2017-02-28 20:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=58b5e29f.ntc2TpbtbQUcTnYU%akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lokeshvutla@ti.com \
--cc=m-karicheri2@ti.com \
--cc=mm-commits@vger.kernel.org \
--cc=nm@ti.com \
--cc=nsekhar@ti.com \
--cc=t-kristo@ti.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.