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

Commit b2118ea9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull apparmor fixes from James Morris:
 "A couple more regressions fixed"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix bad lock balance when introspecting policy
  apparmor: fix memleak of the profile hash
parents 056cdce0 ed2c7da3

security/apparmor/apparmorfs.c

+1 −3
Original line number Diff line number Diff line
@@ -580,15 +580,13 @@ static struct aa_namespace *__next_namespace(struct aa_namespace *root, 


	/* check if the next ns is a sibling, parent, gp, .. */

	parent = ns->parent;

	while (parent) {

	while (ns != root) {

		mutex_unlock(&ns->lock);

		next = list_entry_next(ns, base.list);

		if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {

			mutex_lock(&next->lock);

			return next;

		}

		if (parent == root)

			return NULL;

		ns = parent;

		parent = parent->parent;

	}

security/apparmor/policy.c

+1 −0
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ void aa_free_profile(struct aa_profile *profile) 
	aa_put_dfa(profile->policy.dfa);

	aa_put_replacedby(profile->replacedby);



	kzfree(profile->hash);

	kzfree(profile);

}