From bc75a6eb856cb1507fa907bf6c1eda91b3fef52f Mon Sep 17 00:00:00 2001

From: Ding Xiang <dingxiang@cmss.chinamobile.com>

Date: Mon, 30 May 2022 18:00:47 +0800

Subject: [PATCH] ext4: make variable "count" signed

Git-commit: bc75a6eb856cb1507fa907bf6c1eda91b3fef52f

Patch-mainline: v5.19-rc3

References: bsc#1200820

Since dx_make_map() may return -EFSCORRUPTED now, so change "count" to

be a signed integer so we can correctly check for an error code returned

by dx_make_map().

Fixes: 46c116b920eb ("ext4: verify dir block before splitting it")

Cc: stable@kernel.org

Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>

Link: https://lore.kernel.org/r/20220530100047.537598-1-dingxiang@cmss.chinamobile.com

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

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

---

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

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

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

index 47d0ca4c795b..db4ba99d1ceb 100644

--- a/fs/ext4/namei.c

+++ b/fs/ext4/namei.c

@@ -1929,7 +1929,8 @@ static struct ext4_dir_entry_2 *do_split(handle_t *handle, struct inode *dir,

 			struct dx_hash_info *hinfo)

 {

 	unsigned blocksize = dir->i_sb->s_blocksize;

-	unsigned count, continued;

+	unsigned continued;

+	int count;

 	struct buffer_head *bh2;

 	ext4_lblk_t newblock;

 	u32 hash2;

-- 

2.35.3