]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
apparmor: Fix shadowed local variable in unpack_trans_table()
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 6 Jul 2017 08:56:21 +0000 (10:56 +0200)
committerSeth Forshee <seth.forshee@canonical.com>
Tue, 5 Sep 2017 12:34:44 +0000 (07:34 -0500)
commitfacca57d0c49fc9e021f6ced586cd4ec155496f9
tree20ed2b302913cafb6ce2fc71d606fa80833b5953
parenta2b93262d96169e31c8d9d9e4fe852a69aa456c7
apparmor: Fix shadowed local variable in unpack_trans_table()

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 <geert@linux-m68k.org>
Reviewed-by: Serge Hallyn <serge@hallyn.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
(cherry picked from commit 966d631935a578fadb5770f17a957ee1a969d868 linux-next)
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
security/apparmor/policy_unpack.c