drop 4.14.y ext4 broken patch

diff --git a/queue-4.14/ext4-force-revalidation-of-directory-pointer-after-seekdir-2.patch b/queue-4.14/ext4-force-revalidation-of-directory-pointer-after-seekdir-2.patch
deleted file mode 100644 (file)
index 00b305c..0000000
--- a/queue-4.14/ext4-force-revalidation-of-directory-pointer-after-seekdir-2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From e40ff213898502d299351cc2fe1e350cd186f0d3 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Sun, 1 Apr 2018 23:21:03 -0400
-Subject: ext4: force revalidation of directory pointer after seekdir(2)
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit e40ff213898502d299351cc2fe1e350cd186f0d3 upstream.
-
-A malicious user could force the directory pointer to be in an invalid
-spot by using seekdir(2).  Use the mechanism we already have to notice
-if the directory has changed since the last time we called
-ext4_readdir() to force a revalidation of the pointer.
-
-Reported-by: syzbot+1236ce66f79263e8a862@syzkaller.appspotmail.com
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Cc: stable@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ext4/dir.c |    8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
---- a/fs/ext4/dir.c
-+++ b/fs/ext4/dir.c
-@@ -364,13 +364,15 @@ static loff_t ext4_dir_llseek(struct fil
- {
-       struct inode *inode = file->f_mapping->host;
-       int dx_dir = is_dx_dir(inode);
--      loff_t htree_max = ext4_get_htree_eof(file);
-+      loff_t ret, htree_max = ext4_get_htree_eof(file);
- 
-       if (likely(dx_dir))
--              return generic_file_llseek_size(file, offset, whence,
-+              ret = generic_file_llseek_size(file, offset, whence,
-                                                   htree_max, htree_max);
-       else
--              return ext4_llseek(file, offset, whence);
-+              ret = ext4_llseek(file, offset, whence);
-+      file->f_version = inode_peek_iversion(inode) - 1;
-+      return ret;
- }
- 
- /*

diff --git a/queue-4.14/series b/queue-4.14/series
index a1d5222bf3b58447066b173f1735b93665d40518..f9ed4d220bcd14d0e4904d31b2390543c7e0e977 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -82,4 +82,3 @@ ext4-don-t-allow-r-w-mounts-if-metadata-blocks-overlap-the-superblock.patch
 ext4-move-call-to-ext4_error-into-ext4_xattr_check_block.patch
 ext4-add-bounds-checking-to-ext4_xattr_find_entry.patch
 ext4-add-extra-checks-to-ext4_xattr_block_get.patch
-ext4-force-revalidation-of-directory-pointer-after-seekdir-2.patch