Unverified Commit 57ed0ab6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6308 v3 ima: Avoid blocking in RCU read-side critical section 

Merge Pull Request from: @ci-robot 
 
PR sync from: GUO Zihua <guozihua@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KDPOC7WODLGMLVMQFF2OCZO3PKTHAUVN/ 
 
https://gitee.com/openeuler/kernel/issues/I9HXKB 
 
Link:https://gitee.com/openeuler/kernel/pulls/6308

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 58f92ad6 67169ec8

security/integrity/ima/ima_policy.c

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry) 
	 * Immutable elements are copied over as pointers and data; only

	 * lsm rules can change

	 */

	nentry = kmemdup(entry, sizeof(*nentry), GFP_KERNEL);

	nentry = kmemdup(entry, sizeof(*nentry), GFP_ATOMIC);

	if (!nentry)

		return NULL;

security/selinux/ss/services.c

+1 −1
Original line number Diff line number Diff line
@@ -3584,7 +3584,7 @@ int selinux_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule) 
		return -EINVAL;

	}



	tmprule = kzalloc(sizeof(struct selinux_audit_rule), GFP_KERNEL);

	tmprule = kzalloc(sizeof(struct selinux_audit_rule), GFP_ATOMIC);

	if (!tmprule)

		return -ENOMEM;