Skip to content
/ linux Public

Commit fe13642

Browse files
LATENTBOUNCESasha Levin
authored andcommitted
jfs: nlink overflow in jfs_rename
[ Upstream commit 9218dc2 ] If nlink is maximal for a directory (-1) and inside that directory you perform a rename for some child directory (not moving from the parent), then the nlink of the first directory is first incremented and later decremented. Normally this is fine, but when nlink = -1 this causes a wrap around to 0, and then drop_nlink issues a warning. After applying the patch syzbot no longer issues any warnings. I also ran some basic fs tests to look for any regressions. Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl> Reported-by: syzbot+9131ddfd7870623b719f@syzkaller.appspotmail.com Closes: https://syzbot.org/bug?extid=9131ddfd7870623b719f Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 974dac5 commit fe13642

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

fs/jfs/namei.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ static int jfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
12281228
jfs_err("jfs_rename: dtInsert returned -EIO");
12291229
goto out_tx;
12301230
}
1231-
if (S_ISDIR(old_ip->i_mode))
1231+
if (S_ISDIR(old_ip->i_mode) && old_dir != new_dir)
12321232
inc_nlink(new_dir);
12331233
}
12341234
/*
@@ -1244,7 +1244,9 @@ static int jfs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
12441244
goto out_tx;
12451245
}
12461246
if (S_ISDIR(old_ip->i_mode)) {
1247-
drop_nlink(old_dir);
1247+
if (new_ip || old_dir != new_dir)
1248+
drop_nlink(old_dir);
1249+
12481250
if (old_dir != new_dir) {
12491251
/*
12501252
* Change inode number of parent for moved directory

0 commit comments

Comments
 (0)