Unverified Commit 6b9cf668 authored Aug 26, 2024 by openeuler-ci-bot Committed by Gitee Aug 26, 2024

!11078 nilfs2: fix general protection fault in nilfs_btree_insert()

Merge Pull Request from: @ci-robot 
 
PR sync from: Yang Yingliang <yangyingliang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FOKZ646HWGKW23EI6PZ7NOXF7XV5GR6Q/ 
 
https://gitee.com/src-openeuler/kernel/issues/IALLDY 
 
Link:https://gitee.com/openeuler/kernel/pulls/11078

 

Reviewed-by: Liu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: zhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>

parents cdf6c838 9d99ea33

fs/nilfs2/btree.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -478,9 +478,18 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr,
		ret = nilfs_btnode_submit_block(btnc, ptr, 0, REQ_OP_READ, 0, &bh,
		&submit_ptr);
		if (ret) {
		if (ret != -EEXIST)
		return ret;
		if (likely(ret == -EEXIST))
		goto out_check;
		if (ret == -ENOENT) {
		/*
		* Block address translation failed due to invalid
		* value of 'ptr'. In this case, return internal code
		* -EINVAL (broken bmap) to notify bmap layer of fatal
		* metadata corruption.
		*/
		ret = -EINVAL;
		}
		return ret;
		}

		if (ra) {