From patchwork Tue Apr 13 07:09:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 50035 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 17550B7C67 for ; Tue, 13 Apr 2010 17:09:56 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1aFq-0005cT-K7; Tue, 13 Apr 2010 08:09:50 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1aFn-0005bI-OP for kernel-team@lists.ubuntu.com; Tue, 13 Apr 2010 08:09:47 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O1aFn-0002zd-N3; Tue, 13 Apr 2010 08:09:47 +0100 Received: from [96.225.230.137] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1O1aFn-0002aO-An; Tue, 13 Apr 2010 08:09:47 +0100 From: john.johansen@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 01/11] AppArmor: Fix put of unassigned ns if aa_unpack fails Date: Tue, 13 Apr 2010 00:09:30 -0700 Message-Id: <1271142580-26555-2-git-send-email-john.johansen@canonical.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1271142580-26555-1-git-send-email-john.johansen@canonical.com> References: <1271142580-26555-1-git-send-email-john.johansen@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: John Johansen If the call to aa_unpack in aa_interface_replace_profiles fails, it jumps to the end of the function which performs a put_namespace on the unassigned ns variable. Signed-off-by: John Johansen Acked-by: Andy Whitcroft --- security/apparmor/policy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index a92ad82..61f0043 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -904,7 +904,7 @@ ssize_t aa_interface_replace_profiles(void *udata, size_t size, bool add_only) struct aa_policy *policy; struct aa_profile *old_profile = NULL, *new_profile = NULL; struct aa_profile *rename_profile = NULL; - struct aa_namespace *ns; + struct aa_namespace *ns = NULL; ssize_t error; struct aa_audit_iface sa = { .base.operation = "profile_replace",