From patchwork Fri Mar 31 12:57:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 745633 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 3vvhQX3c2vz9s03; Fri, 31 Mar 2017 23:59:00 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1ctw8n-0000yQ-8F; Fri, 31 Mar 2017 12:58:57 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ctw81-0000i6-Qh for kernel-team@lists.ubuntu.com; Fri, 31 Mar 2017 12:58:09 +0000 Received: from static-50-53-32-2.bvtn.or.frontiernet.net ([50.53.32.2] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1ctw81-0006AY-7S for kernel-team@lists.ubuntu.com; Fri, 31 Mar 2017 12:58:09 +0000 From: John Johansen To: kernel-team@lists.ubuntu.com Subject: [PATCH 03/11] UBUNTU: SAUCE: apparmor: fix reference count bug in label_merge_insert() Date: Fri, 31 Mar 2017 05:57:36 -0700 Message-Id: <20170331125744.16986-4-john.johansen@canonical.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170331125744.16986-1-john.johansen@canonical.com> References: <20170331125744.16986-1-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 @new does not have a reference taken locally and should not have its reference put locally either. BugLink: http://bugs.launchpad.net/bugs/1660833 Signed-off-by: John Johansen Acked-by: Stefan Bader Acked-by: Tim Gardner Acked-by: Brad Figg Signed-off-by: Thadeu Lima de Souza Cascardo --- security/apparmor/label.c | 1 - 1 file changed, 1 deletion(-) diff --git a/security/apparmor/label.c b/security/apparmor/label.c index 738fe52..05ac6d6 100644 --- a/security/apparmor/label.c +++ b/security/apparmor/label.c @@ -1083,7 +1083,6 @@ 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) {