drop vfs patch from 3.18

diff --git a/queue-3.18/series b/queue-3.18/series
index d4b0e4826787ec3b9274b98857e06fd75c1d54c2..c4e6ee49cc132a7d27c9a738a4aa3aed98d79387 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -13,4 +13,3 @@ console-dummy-leave-.con_font_get-set-to-null.patch
 btrfs-fix-deadlock-in-run_delalloc_nocow.patch
 btrfs-fix-crash-due-to-not-cleaning-up-tree-log-block-s-dirty-bits.patch
 alsa-seq-fix-racy-pool-initializations.patch
-vfs-don-t-do-rcu-lookup-of-empty-pathnames.patch

diff --git a/queue-3.18/vfs-don-t-do-rcu-lookup-of-empty-pathnames.patch b/queue-3.18/vfs-don-t-do-rcu-lookup-of-empty-pathnames.patch
deleted file mode 100644 (file)
index 95d01d7..0000000
--- a/queue-3.18/vfs-don-t-do-rcu-lookup-of-empty-pathnames.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c0eb027e5aef70b71e5a38ee3e264dc0b497f343 Mon Sep 17 00:00:00 2001
-From: Linus Torvalds <torvalds@linux-foundation.org>
-Date: Sun, 2 Apr 2017 17:10:08 -0700
-Subject: vfs: don't do RCU lookup of empty pathnames
-
-From: Linus Torvalds <torvalds@linux-foundation.org>
-
-commit c0eb027e5aef70b71e5a38ee3e264dc0b497f343 upstream.
-
-Normal pathname lookup doesn't allow empty pathnames, but using
-AT_EMPTY_PATH (with name_to_handle_at() or fstatat(), for example) you
-can trigger an empty pathname lookup.
-
-And not only is the RCU lookup in that case entirely unnecessary
-(because we'll obviously immediately finalize the end result), it is
-actively wrong.
-
-Why? An empth path is a special case that will return the original
-'dirfd' dentry - and that dentry may not actually be RCU-free'd,
-resulting in a potential use-after-free if we were to initialize the
-path lazily under the RCU read lock and depend on complete_walk()
-finalizing the dentry.
-
-Found by syzkaller and KASAN.
-
-Reported-by: Dmitry Vyukov <dvyukov@google.com>
-Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
-Acked-by: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Eric Biggers <ebiggers3@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/namei.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/fs/namei.c
-+++ b/fs/namei.c
-@@ -1851,6 +1851,9 @@ static int path_init(int dfd, const char
- {
-       int retval = 0;
- 
-+      if (!*s)
-+              flags &= ~LOOKUP_RCU;
-+
-       nd->last_type = LAST_ROOT; /* if there are only slashes... */
-       nd->flags = flags | LOOKUP_JUMPED;
-       nd->depth = 0;