diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2017-07-06 10:56:21 +0200 |
|---|---|---|
| committer |   John Johansen <john.johansen@canonical.com> | 2017-09-22 13:00:57 -0700 |
| commit | 19fe43a54fb67b6cc8857e65c78e1dc8aa2e97a3 (patch) | |
| tree | d298f500677bf80698bc5b75832bb556018fdf84 /security/apparmor/policy_unpack.c | |
| parent | Linux 4.13-rc2 (diff) | |
| download | linux-dev-19fe43a54fb67b6cc8857e65c78e1dc8aa2e97a3.tar.xz linux-dev-19fe43a54fb67b6cc8857e65c78e1dc8aa2e97a3.zip | |
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>
Diffstat (limited to 'security/apparmor/policy_unpack.c')
| -rw-r--r-- | security/apparmor/policy_unpack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index c600f4dd1783..2d5a1a007b06 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -448,7 +448,7 @@ fail: */ 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; } |