Unverified Commit 938bb38a authored Feb 08, 2025 by openeuler-ci-bot Committed by Gitee Feb 08, 2025

!15014 v2 nilfs2: prevent use of deleted inode

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiangwei Li <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/L5NZMEV3L2PUINDVQUSLRX5556TGYTJD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBJC7J 
 
Link:https://gitee.com/openeuler/kernel/pulls/15014

 

Reviewed-by: zhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: Li Nan <linan122@huawei.com>
Signed-off-by: Li Nan <linan122@huawei.com>

parents 0dfa6b9e 238f4962

fs/nilfs2/inode.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -618,8 +618,14 @@ struct inode nilfs_iget(struct super_block sb, struct nilfs_root *root,
		inode = nilfs_iget_locked(sb, root, ino);
		if (unlikely(!inode))
		return ERR_PTR(-ENOMEM);
		if (!(inode->i_state & I_NEW))

		if (!(inode->i_state & I_NEW)) {
		if (!inode->i_nlink) {
		iput(inode);
		return ERR_PTR(-ESTALE);
		}
		return inode;
		}

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

fs/nilfs2/namei.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,11 @@ nilfs_lookup(struct inode dir, struct dentry dentry, unsigned int flags)
		inode = NULL;
		} else {
		inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino);
		if (inode == ERR_PTR(-ESTALE)) {
		nilfs_error(dir->i_sb,
		"deleted inode referenced: %lu", ino);
		return ERR_PTR(-EIO);
		}
		}

		return d_splice_alias(inode, dentry);