Commit 91b65ec6 authored by John Johansen's avatar John Johansen Committed by Tim Gardner

Revert "UBUNTU: SAUCE: apparmor: Don't remove label on rcu callback if the...

Revert "UBUNTU: SAUCE: apparmor: Don't remove label on rcu callback if the label has already been removed"

BugLink: http://bugs.launchpad.net/bugs/1379535

This reverts commit 838dc2541c639b30a25ecb484cb63c04e2848d8d.
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
parent d918ada2
...@@ -260,8 +260,7 @@ static void label_free_rcu(struct rcu_head *head) ...@@ -260,8 +260,7 @@ static void label_free_rcu(struct rcu_head *head)
{ {
struct aa_label *l = container_of(head, struct aa_label, rcu); struct aa_label *l = container_of(head, struct aa_label, rcu);
if (l->flags & FLAG_IN_TREE) (void) aa_label_remove(labels_set(l), l);
(void) aa_label_remove(labels_set(l), l);
label_free_switch(l); label_free_switch(l);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment