Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:27 +0100
committerJiri Slaby <jslaby@suse.cz>2019-01-18 07:53:42 +0100
commitb09a66797fab11f8e98c5bcb1e2e20cde397e86c (patch)
treee838dd13251744552779e2c60d2e4bb96427b581
parentcc929d8ca30fe4cd950aef7d57ce7b4ce58141df (diff)
ext4: fix special inode number checks in __ext4_iget()
-rw-r--r--patches.kernel.org/4.20.3-052-ext4-fix-special-inode-number-checks-in-__ext4.patch42
-rw-r--r--series.conf1
2 files changed, 43 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.3-052-ext4-fix-special-inode-number-checks-in-__ext4.patch b/patches.kernel.org/4.20.3-052-ext4-fix-special-inode-number-checks-in-__ext4.patch
new file mode 100644
index 0000000000..2e7211f019
--- /dev/null
+++ b/patches.kernel.org/4.20.3-052-ext4-fix-special-inode-number-checks-in-__ext4.patch
@@ -0,0 +1,42 @@
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Mon, 31 Dec 2018 22:34:31 -0500
+Subject: [PATCH] ext4: fix special inode number checks in __ext4_iget()
+References: bnc#1012628
+Patch-mainline: 4.20.3
+Git-commit: 191ce17876c9367819c4b0a25b503c0f6d9054d8
+
+commit 191ce17876c9367819c4b0a25b503c0f6d9054d8 upstream.
+
+The check for special (reserved) inode number checks in __ext4_iget()
+was broken by commit 8a363970d1dc: ("ext4: avoid declaring fs
+inconsistent due to invalid file handles"). This was caused by a
+botched reversal of the sense of the flag now known as
+EXT4_IGET_SPECIAL (when it was previously named EXT4_IGET_NORMAL).
+Fix the logic appropriately.
+
+Fixes: 8a363970d1dc ("ext4: avoid declaring fs inconsistent...")
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
+Cc: stable@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ fs/ext4/inode.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
+index 165ff331d998..34d7e0703cc6 100644
+--- a/fs/ext4/inode.c
++++ b/fs/ext4/inode.c
+@@ -4834,7 +4834,7 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
+ gid_t i_gid;
+ projid_t i_projid;
+
+- if (((flags & EXT4_IGET_NORMAL) &&
++ if ((!(flags & EXT4_IGET_SPECIAL) &&
+ (ino < EXT4_FIRST_INO(sb) && ino != EXT4_ROOT_INO)) ||
+ (ino < EXT4_ROOT_INO) ||
+ (ino > le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count))) {
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 601cdff155..a980e7ebeb 100644
--- a/series.conf
+++ b/series.conf
@@ -289,6 +289,7 @@
patches.kernel.org/4.20.3-049-ext4-avoid-kernel-warning-when-writing-the-sup.patch
patches.kernel.org/4.20.3-050-ext4-use-ext4_write_inode-when-fsyncing-w-o-a-.patch
patches.kernel.org/4.20.3-051-ext4-track-writeback-errors-using-the-generic-.patch
+ patches.kernel.org/4.20.3-052-ext4-fix-special-inode-number-checks-in-__ext4.patch
########################################################
# Build fixes that apply to the vanilla kernel too.