From patchwork Tue Aug 23 09:05:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 661775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3sJPgl0413z9sBr; Tue, 23 Aug 2016 19:06:27 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bc7f5-0006HP-4D; Tue, 23 Aug 2016 09:06:23 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bc7ex-0006Fz-PQ for kernel-team@lists.ubuntu.com; Tue, 23 Aug 2016 09:06:15 +0000 Received: from static-50-53-49-26.bvtn.or.frontiernet.net ([50.53.49.26] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bc7ex-0006Tk-6n for kernel-team@lists.ubuntu.com; Tue, 23 Aug 2016 09:06:15 +0000 From: John Johansen To: kernel-team@lists.ubuntu.com Subject: [PATCH 01/14] UBUNTU: SAUCE: apparmor: Fix __label_update proxy comparison test Date: Tue, 23 Aug 2016 02:05:41 -0700 Message-Id: <1471943154-14507-2-git-send-email-john.johansen@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1471943154-14507-1-git-send-email-john.johansen@canonical.com> References: <1471943154-14507-1-git-send-email-john.johansen@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com 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 --- security/apparmor/label.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/apparmor/label.c b/security/apparmor/label.c index 21c9d6f..c453fc8 100644 --- 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++; }