Revert "UBUNTU: SAUCE: apparmor: fix reference count bug in label_merge_insert()"

This reverts commit cad5842add5ae0fc35c8535f26aed8ed65a24b33.

BugLink: https://bugs.launchpad.net/bugs/1666897
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 05ac6d6c9c82cc4495a047670937cc86912871d8..738fe521875611a1ab0cf22b10ddb4477cbf99cb 100644 (file)
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -1083,6 +1083,7 @@ static struct aa_label *label_merge_insert(struct aa_label *new,
                /* TODO: deal with reference labels */
                if (new->size == 1) {
                        label = aa_get_label(&new->vec[0]->label);
+                       aa_put_label(new);
                        return label;
                }
        } else if (!stale) {