Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp2705775imm; Fri, 20 Jul 2018 03:32:54 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcJPkR0HG0TWpfNOkrh/S3oMieORUEG3ve1ct2yjIzLAS1dnyW8C2QrZGTUTcFK8sHtXp34 X-Received: by 2002:a63:5a5e:: with SMTP id k30-v6mr1542936pgm.123.1532082774746; Fri, 20 Jul 2018 03:32:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532082774; cv=none; d=google.com; s=arc-20160816; b=pbz5J69spN+OySqlIlB/OdRmfYohokLmUog+8ORIlz0jc8x7dnO+u0PcQlwEhW0pRm c8U7Fhx1A9A6QohSYRTUm9Sd75Obeo+b+BrvI7rwLU5zHrpH4s7AmDQ2N0t16Klv8HLG Km2J8rsW/e+rt0rwtVEOslrOSt2tnnQanDp9ZhwOMolowWGZ7t4PmzBP1a8O3NwJ0yob 6yWtrymiCgvWFivLbg8np/P7fxJ3eGkShheHchAX7yQ6crxSLyIrOPGGlVSXNmE/7o7v LWJ1QETFUKTJ71dVfWE/or0TJd7bCFpmzyxrbw1MG3nRJjpWR8MC3dOr+0eBNpyLt2TH Et1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:autocrypt:openpgp:from:references:cc:to :subject:arc-authentication-results; bh=xFWsZY4dT/ecXrNu6KqHiKuuolt3QYWQ4ZpvSznA7Ec=; b=XjIk/aQgdF/TlFj+G5uR+0F4h4Zn9qARZ1STWEUYdKdjhFN48NAk8ADjhLSdx9YZ9m Tx8GeN2QJypKHvo/a39GsBI9Ibmro4E3UhSslDhgpvkJKpXhZmutx8L0xzOFIUR8poQV MlCPLCTkNvHvNXlxQUijXsfo7lmXmcb86M6KsM3HKH4ehqyFd11dNHZqEdgHlkvWajUX Gi3jY99PnetA2UnnVxWf3ZG9TiOdX/ymD//AfLDwVUVcCsC4A6LuvlMEixoCWx1++zeT HrDNOIZAn0FpGAbH1q0rTb6Yb6mmkm4L5c0C1VZ68d1AbSG6R6Rzncz7vVfT8fVJFkWQ xL0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k7-v6si1414476pgk.595.2018.07.20.03.32.39; Fri, 20 Jul 2018 03:32:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728312AbeGTLTk (ORCPT + 99 others); Fri, 20 Jul 2018 07:19:40 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:55598 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727167AbeGTLTk (ORCPT ); Fri, 20 Jul 2018 07:19:40 -0400 Received: from static-50-53-48-205.bvtn.or.frontiernet.net ([50.53.48.205] helo=[192.168.192.153]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fgShc-0008Hj-3h; Fri, 20 Jul 2018 10:32:00 +0000 Subject: Re: [PATCH] apparmor: remove redundant pointer 'info' To: Colin King , James Morris , "Serge E . Hallyn" , linux-security-module@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20180714161905.5403-1-colin.king@canonical.com> From: John Johansen Openpgp: preference=signencrypt Autocrypt: addr=john.johansen@canonical.com; prefer-encrypt=mutual; keydata= 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 Organization: Canonical Message-ID: <5702474d-5215-cdea-8d77-24f45fef92cc@canonical.com> Date: Fri, 20 Jul 2018 03:31:57 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20180714161905.5403-1-colin.king@canonical.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/14/2018 09:19 AM, Colin King wrote: > From: Colin Ian King > > Pointer 'info' is being assigned but is never used hence it is > redundant and can be removed. > > Cleans up clang warning: > warning: variable 'info' set but not used [-Wunused-but-set-variable] > NAK, real problem wrong fix, instead of deleting the additional context info we need to be auditing it diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index 098d546d8253..08c88de0ffda 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c @@ -1036,7 +1036,7 @@ static struct aa_label *build_change_hat(struct aa_profile *profile, audit: aa_audit_file(profile, &nullperms, OP_CHANGE_HAT, AA_MAY_CHANGEHAT, name, hat ? hat->base.hname : NULL, - hat ? &hat->label : NULL, GLOBAL_ROOT_UID, NULL, + hat ? &hat->label : NULL, GLOBAL_ROOT_UID, info, error); if (!hat || (error && error != -ENOENT)) return ERR_PTR(error); I pushed this fix into apparmor-next > Signed-off-by: Colin Ian King > --- > security/apparmor/domain.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c > index 098d546d8253..410d9ce09861 100644 > --- a/security/apparmor/domain.c > +++ b/security/apparmor/domain.c > @@ -1006,7 +1006,6 @@ static struct aa_label *build_change_hat(struct aa_profile *profile, > const char *name, bool sibling) > { > struct aa_profile *root, *hat = NULL; > - const char *info = NULL; > int error = 0; > > if (sibling && PROFILE_IS_HAT(profile)) { > @@ -1014,7 +1013,6 @@ static struct aa_label *build_change_hat(struct aa_profile *profile, > } else if (!sibling && !PROFILE_IS_HAT(profile)) { > root = aa_get_profile(profile); > } else { > - info = "conflicting target types"; > error = -EPERM; > goto audit; > } > @@ -1025,10 +1023,8 @@ static struct aa_label *build_change_hat(struct aa_profile *profile, > if (COMPLAIN_MODE(profile)) { > hat = aa_new_null_profile(profile, true, name, > GFP_KERNEL); > - if (!hat) { > - info = "failed null profile create"; > + if (!hat) > error = -ENOMEM; > - } > } > } > aa_put_profile(root); >