Skip to content

Commit 901ce97

Browse files
ea1davisakpm00
authored andcommitted
nilfs2: prevent use of deleted inode
syzbot reported a WARNING in nilfs_rmdir. [1] Because the inode bitmap is corrupted, an inode with an inode number that should exist as a ".nilfs" file was reassigned by nilfs_mkdir for "file0", causing an inode duplication during execution. And this causes an underflow of i_nlink in rmdir operations. The inode is used twice by the same task to unmount and remove directories ".nilfs" and "file0", it trigger warning in nilfs_rmdir. Avoid to this issue, check i_nlink in nilfs_iget(), if it is 0, it means that this inode has been deleted, and iput is executed to reclaim it. [1] WARNING: CPU: 1 PID: 5824 at fs/inode.c:407 drop_nlink+0xc4/0x110 fs/inode.c:407 ... Call Trace: <TASK> nilfs_rmdir+0x1b0/0x250 fs/nilfs2/namei.c:342 vfs_rmdir+0x3a3/0x510 fs/namei.c:4394 do_rmdir+0x3b5/0x580 fs/namei.c:4453 __do_sys_rmdir fs/namei.c:4472 [inline] __se_sys_rmdir fs/namei.c:4470 [inline] __x64_sys_rmdir+0x47/0x50 fs/namei.c:4470 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xf3/0x230 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f Link: https://lkml.kernel.org/r/[email protected] Fixes: d250065 ("nilfs2: pathname operations") Signed-off-by: Ryusuke Konishi <[email protected]> Reported-by: [email protected] Closes: https://syzkaller.appspot.com/bug?extid=9260555647a5132edd48 Tested-by: [email protected] Signed-off-by: Edward Adam Davis <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 74363ec commit 901ce97

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

fs/nilfs2/inode.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,14 @@ struct inode *nilfs_iget(struct super_block *sb, struct nilfs_root *root,
544544
inode = nilfs_iget_locked(sb, root, ino);
545545
if (unlikely(!inode))
546546
return ERR_PTR(-ENOMEM);
547-
if (!(inode->i_state & I_NEW))
547+
548+
if (!(inode->i_state & I_NEW)) {
549+
if (!inode->i_nlink) {
550+
iput(inode);
551+
return ERR_PTR(-ESTALE);
552+
}
548553
return inode;
554+
}
549555

550556
err = __nilfs_read_inode(sb, root, ino, inode);
551557
if (unlikely(err)) {

fs/nilfs2/namei.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
6767
inode = NULL;
6868
} else {
6969
inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino);
70+
if (inode == ERR_PTR(-ESTALE)) {
71+
nilfs_error(dir->i_sb,
72+
"deleted inode referenced: %lu", ino);
73+
return ERR_PTR(-EIO);
74+
}
7075
}
7176

7277
return d_splice_alias(inode, dentry);

0 commit comments

Comments
 (0)