ima: Have the LSM free its audit rule
[ Upstream commit9ff8a616df
] 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:b169424551
("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
7ecfbee3b9
commit
2092075629
|
@ -362,6 +362,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
|
||||
|
@ -372,6 +373,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)
|
||||
{
|
||||
|
|
|
@ -254,7 +254,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);
|
||||
|
|
Loading…
Reference in New Issue