Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e290764 authored by Tyler Hicks's avatar Tyler Hicks Committed by Greg Kroah-Hartman
Browse files

ima: Have the LSM free its audit rule 



commit 9ff8a616dfab96a4fa0ddd36190907dc68886d9b upstream.

Ask the LSM to free its audit rule rather than directly calling kfree().
Both AppArmor and SELinux do additional work in their audit_rule_free()
hooks. Fix memory leaks by allowing the LSMs to perform necessary work.

Fixes: b16942455193 ("ima: use the lsm policy update notifier")
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.microsoft.com>
Cc: Janne Karhunen <janne.karhunen@gmail.com>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Signed-off-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Cc: <stable@vger.kernel.org> # 4.19+
Signed-off-by: default avatarGou Hao <gouhao@uniontech.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent acf4387e

security/integrity/ima/ima.h

+5 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static inline int ima_read_xattr(struct dentry *dentry, 
#ifdef CONFIG_IMA_LSM_RULES



#define security_filter_rule_init security_audit_rule_init

#define security_filter_rule_free security_audit_rule_free

#define security_filter_rule_match security_audit_rule_match



#else
@@ -308,6 +309,10 @@ static inline int security_filter_rule_init(u32 field, u32 op, char *rulestr, 
	return -EINVAL;

}



static inline void security_filter_rule_free(void *lsmrule)

{

}



static inline int security_filter_rule_match(u32 secid, u32 field, u32 op,

					     void *lsmrule,

					     struct audit_context *actx)

security/integrity/ima/ima_policy.c

+3 −1
Original line number Diff line number Diff line
@@ -1044,8 +1044,10 @@ void ima_delete_rules(void) 


	temp_ima_appraise = 0;

	list_for_each_entry_safe(entry, tmp, &ima_temp_rules, list) {

		for (i = 0; i < MAX_LSM_RULES; i++)

		for (i = 0; i < MAX_LSM_RULES; i++) {

			security_filter_rule_free(entry->lsm[i].rule);

			kfree(entry->lsm[i].args_p);

		}



		list_del(&entry->list);

		kfree(entry);