remove unused fuse 4.1 patch

diff --git a/queue-4.1/fs-fuse-fix-ioctl-type-confusion.patch b/queue-4.1/fs-fuse-fix-ioctl-type-confusion.patch
deleted file mode 100644 (file)
index 3e1b163..0000000
--- a/queue-4.1/fs-fuse-fix-ioctl-type-confusion.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8ed1f0e22f49ef42e63875fd2529389a32ff3566 Mon Sep 17 00:00:00 2001
-From: Jann Horn <jann@thejh.net>
-Date: Sun, 16 Aug 2015 20:27:01 +0200
-Subject: fs/fuse: fix ioctl type confusion
-
-From: Jann Horn <jann@thejh.net>
-
-commit 8ed1f0e22f49ef42e63875fd2529389a32ff3566 upstream.
-
-fuse_dev_ioctl() performed fuse_get_dev() on a user-supplied fd,
-leading to a type confusion issue. Fix it by checking file->f_op.
-
-Signed-off-by: Jann Horn <jann@thejh.net>
-Acked-by: Miklos Szeredi <miklos@szeredi.hu>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
-index 80cc1b35d460..ebb5e37455a0 100644
---- a/fs/fuse/dev.c
-+++ b/fs/fuse/dev.c
-@@ -2246,7 +2246,15 @@ static long fuse_dev_ioctl(struct file *file, unsigned int cmd,
- 
-                       err = -EINVAL;
-                       if (old) {
--                              struct fuse_dev *fud = fuse_get_dev(old);
-+                              struct fuse_dev *fud = NULL;
-+
-+                              /*
-+                               * Check against file->f_op because CUSE
-+                               * uses the same ioctl handler.
-+                               */
-+                              if (old->f_op == file->f_op &&
-+                                  old->f_cred->user_ns == file->f_cred->user_ns)
-+                                      fud = fuse_get_dev(old);
- 
-                               if (fud) {
-                                       mutex_lock(&fuse_mutex);

diff --git a/queue-4.1/series b/queue-4.1/series
index d1fa173616c66bf5f1216347e6e843d4b134cbd2..4f38cc02e1d5fba8676d6e54f908510d7a0657e7 100644 (file)
--- a/queue-4.1/series
+++ b/queue-4.1/series
@@ -45,4 +45,3 @@ add-radeon-suspend-resume-quirk-for-hp-compaq-dc5750.patch
 mm-check-if-section-present-during-memory-block-registering.patch
 x86-mm-initialize-pmd_idx-in-page_table_range_init_count.patch
 mm-make-page-pfmemalloc-check-more-robust.patch
-fs-fuse-fix-ioctl-type-confusion.patch