From fbbbbd2f28aec991f3fbc248df211550fbdfd58c Mon Sep 17 00:00:00 2001

From: Colin Ian King <colin.king@canonical.com>

Date: Fri, 10 May 2019 22:06:38 -0400

Subject: [PATCH] ext4: unsigned int compared against zero

Git-commit: fbbbbd2f28aec991f3fbc248df211550fbdfd58c

Patch-mainline: v5.2-rc1

References: bsc#1158021 CVE-2019-19319

There are two cases where u32 variables n and err are being checked

for less than zero error values, the checks is always false because

the variables are not signed. Fix this by making the variables ints.

Addresses-coverity: ("Unsigned compared against 0")

Fixes: 345c0dbf3a30 ("ext4: protect journal inode's blocks using block_validity")

Signed-off-by: Colin Ian King <colin.king@canonical.com>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Acked-by: Jan Kara <jack@suse.cz>

---

 fs/ext4/block_validity.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c

index 968f163b5feb..8d03550aaae3 100644

--- a/fs/ext4/block_validity.c

+++ b/fs/ext4/block_validity.c

@@ -142,7 +142,8 @@ static int ext4_protect_reserved_inode(struct super_block *sb, u32 ino)

 	struct inode *inode;

 	struct ext4_sb_info *sbi = EXT4_SB(sb);

 	struct ext4_map_blocks map;

-	u32 i = 0, err = 0, num, n;

+	u32 i = 0, num;

+	int err = 0, n;

 	if ((ino < EXT4_ROOT_INO) ||

 	    (ino > le32_to_cpu(sbi->s_es->s_inodes_count)))

-- 

2.16.4