Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752719AbdGFNoc (ORCPT ); Thu, 6 Jul 2017 09:44:32 -0400 Received: from h2.hallyn.com ([78.46.35.8]:60044 "EHLO h2.hallyn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbdGFNoa (ORCPT ); Thu, 6 Jul 2017 09:44:30 -0400 Date: Thu, 6 Jul 2017 08:44:28 -0500 From: "Serge E. Hallyn" To: Geert Uytterhoeven Cc: John Johansen , James Morris , "Serge E . Hallyn" , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] apparmor: Fix shadowed local variable in unpack_trans_table() Message-ID: <20170706134428.GA19254@mail.hallyn.com> References: <1499331381-32753-1-git-send-email-geert@linux-m68k.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1499331381-32753-1-git-send-email-geert@linux-m68k.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1462 Lines: 42 Quoting Geert Uytterhoeven (geert@linux-m68k.org): > with W=2: > > security/apparmor/policy_unpack.c: In function ‘unpack_trans_table’: > security/apparmor/policy_unpack.c:469: warning: declaration of ‘pos’ shadows a previous local > security/apparmor/policy_unpack.c:451: warning: shadowed declaration is here > > Rename the old "pos" to "saved_pos" to fix this. > > Fixes: 5379a3312024a8be ("apparmor: support v7 transition format compatible with label_parse") > Signed-off-by: Geert Uytterhoeven Reviewed-by: Serge Hallyn > --- > security/apparmor/policy_unpack.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c > index c600f4dd1783252a..2d5a1a007b062a73 100644 > --- a/security/apparmor/policy_unpack.c > +++ b/security/apparmor/policy_unpack.c > @@ -448,7 +448,7 @@ static struct aa_dfa *unpack_dfa(struct aa_ext *e) > */ > static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) > { > - void *pos = e->pos; > + void *saved_pos = e->pos; > > /* exec table is optional */ > if (unpack_nameX(e, AA_STRUCT, "xtable")) { > @@ -511,7 +511,7 @@ static bool unpack_trans_table(struct aa_ext *e, struct aa_profile *profile) > > fail: > aa_free_domain_entries(&profile->file.trans); > - e->pos = pos; > + e->pos = saved_pos; > return 0; > } > > -- > 2.7.4