From 191ce17876c9367819c4b0a25b503c0f6d9054d8 Mon Sep 17 00:00:00 2001

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()

Git-commit: 191ce17876c9367819c4b0a25b503c0f6d9054d8

Patch-mainline: v5.0-rc1

References: bsc#1158021 CVE-2019-19319

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

Acked-by: Jan Kara <jack@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.16.4