UBUNTU: SAUCE: apparmor: Fix __label_update proxy comparison test

The comparing the proxy pointer, not the address of the labels proxy pointer.

BugLink: http://bugs.launchpad.net/bugs/1615878
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/security/apparmor/label.c b/security/apparmor/label.c
index 21c9d6f112b2a23b60847d55aa9b02bd5838c559..c453fc815cb3810ebc426fb0be336b6c1935edde 100644 (file)
--- a/security/apparmor/label.c
+++ b/security/apparmor/label.c
@@ -1993,7 +1993,7 @@ static struct aa_label *__label_update(struct aa_label *label)
        write_lock_irqsave(&ls->lock, flags);
        label_for_each(i, label, p) {
                new->vec[i.i] = aa_get_newest_profile(p);
-               if (&new->vec[i.i]->label.proxy != &p->label.proxy)
+               if (new->vec[i.i]->label.proxy != p->label.proxy)
                        invcount++;
        }