Unverified Commit 74a42c78 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13074 selinux: clarify return code in filename_trans_read_helper_compat() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OZMU5AWY2O24I4VG7SXYMUW5JYARACWQ/ 
 
https://gitee.com/openeuler/kernel/issues/IB1MNX 
 
Link:https://gitee.com/openeuler/kernel/pulls/13074

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 7d7bed9b 63482f96

security/selinux/ss/policydb.c

+1 −0
Original line number Diff line number Diff line
@@ -1921,6 +1921,7 @@ static int filename_trans_read_helper_compat(struct policydb *p, void *fp) 
		if (unlikely(ebitmap_get_bit(&datum->stypes, stype - 1))) {

			/* conflicting/duplicate rules are ignored */

			datum = NULL;

			rc = 0;

			goto out;

		}

		if (likely(datum->otype == otype))