Revert "UBUNTU: SAUCE: apparmor: Fix: break circular refcount for label that is direc...

BugLink: http://bugs.launchpad.net/bugs/1379535
This reverts commit 5f63d8b8931e1e33c62793583e9e5ed66ca9cc4b.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 8c645885954d991cd3a5b70f1937f5175656c480..9644cbbfdd4f0958d905f9374bc18478d792b733 100644 (file)
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -227,10 +227,6 @@ void aa_label_destroy(struct aa_label *label)
                        label->ent[i.i] = LABEL_POISON + i.i;
                }
        }
-
-       if (rcu_dereference_protected(label->replacedby->label, true) == label)
-               rcu_assign_pointer(label->replacedby->label, NULL);
-
        aa_free_sid(label->sid);
        aa_put_replacedby(label->replacedby);
        label->replacedby = REPLACEDBY_POISON + 1;