Unverified Commit 70c98c7d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5004 nilfs2: fix potential use after free in nilfs_gccache_submit_read_data() 

Merge Pull Request from: @ci-robot 
 
PR sync from: ZhaoLong Wang <wangzhaolong1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PKZ2HUOQQIK7SXVM6FZSQEM6RPF74QNQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I95AT5 
 
Link:https://gitee.com/openeuler/kernel/pulls/5004

 

Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 6bb06684 a5378097

fs/nilfs2/gcinode.c

+3 −3
Original line number Diff line number Diff line
@@ -73,11 +73,9 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff, 
		struct the_nilfs *nilfs = inode->i_sb->s_fs_info;



		err = nilfs_dat_translate(nilfs->ns_dat, vbn, &pbn);

		if (unlikely(err)) { /* -EIO, -ENOMEM, -ENOENT */

			brelse(bh);

		if (unlikely(err)) /* -EIO, -ENOMEM, -ENOENT */

			goto failed;

	}

	}



	lock_buffer(bh);

	if (buffer_uptodate(bh)) {
@@ -102,6 +100,8 @@ int nilfs_gccache_submit_read_data(struct inode *inode, sector_t blkoff, 
 failed:

	unlock_page(bh->b_page);

	put_page(bh->b_page);

	if (unlikely(err))

		brelse(bh);

	return err;

}