UBUNTU: SAUCE: apparmor: fix stack trace when removing namespace with profiles

BugLink: http://bugs.launchpad.net/bugs/1593874
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>

diff --git a/security/apparmor/policy_ns.c b/security/apparmor/policy_ns.c
index d06e66413745e45770ae9c31ef72ad2b2817e89b..19adb24d00a08c7dbeff35cab71f5c7637274ad0 100644 (file)
--- a/security/apparmor/policy_ns.c
+++ b/security/apparmor/policy_ns.c
@@ -259,9 +259,13 @@ static void destroy_ns(struct aa_ns *ns)
        /* release all sub namespaces */
        __ns_list_release(&ns->sub_ns);
 
-       if (ns->parent)
+       if (ns->parent) {
+               unsigned long flags;
+               write_lock_irqsave(&ns->labels.lock, flags);
                __aa_proxy_redirect(ns_unconfined(ns),
                                    ns_unconfined(ns->parent));
+               write_unlock_irqrestore(&ns->labels.lock, flags);
+       }
        __aa_fs_ns_rmdir(ns);
        mutex_unlock(&ns->lock);
 }