ima: Have the LSM free its audit rule (9ff8a616) · Commits · 戴 / test

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: ("ima: use the lsm policy update notifier") Signed-off-by:

Tyler Hicks <tyhicks@linux.microsoft.com> Cc: Janne Karhunen <janne.karhunen@gmail.com> Cc: Casey Schaufler <casey@schaufler-ca.com> Reviewed-by:

Mimi Zohar <zohar@linux.ibm.com> Signed-off-by:

Mimi Zohar <zohar@linux.ibm.com>

security/integrity/ima/ima.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -420,6 +420,7 @@ static inline void ima_free_modsig(struct modsig *modsig)
		#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
		@@ -430,6 +431,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)
		{

security/integrity/ima/ima_policy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ static void ima_lsm_free_rule(struct ima_rule_entry *entry)
		int i;

		for (i = 0; i < MAX_LSM_RULES; i++) {
		kfree(entry->lsm[i].rule);
		security_filter_rule_free(entry->lsm[i].rule);
		kfree(entry->lsm[i].args_p);
		}
		kfree(entry);

Admin message