Unverified Commit 00fe2905 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14944 ocfs2: fix slab-use-after-free due to dangling pointer dqi_priv 

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

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 367e8c27 8f903618

fs/ocfs2/quota_global.c

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ static int ocfs2_get_next_id(struct super_block *sb, struct kqid *qid) 
	int status = 0;



	trace_ocfs2_get_next_id(from_kqid(&init_user_ns, *qid), type);

	if (!sb_has_quota_loaded(sb, type)) {

	if (!sb_has_quota_active(sb, type)) {

		status = -ESRCH;

		goto out;

	}

fs/ocfs2/quota_local.c

+1 −0
Original line number Diff line number Diff line
@@ -864,6 +864,7 @@ static int ocfs2_local_free_info(struct super_block *sb, int type) 
	brelse(oinfo->dqi_libh);

	brelse(oinfo->dqi_lqi_bh);

	kfree(oinfo);

	info->dqi_priv = NULL;

	return status;

}