mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
6260deec9a
The old out of tree patchseries has been completely dropped. v4.13 has most of the newer apparmor 3.x code in it. v4.14 has the rest except the af_unix mediation which is included as the last patch
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From c6cad5e65a23dcafa1821ca381901297664d9c64 Mon Sep 17 00:00:00 2001
|
||
From: Geert Uytterhoeven <geert@linux-m68k.org>
|
||
Date: Thu, 6 Jul 2017 10:56:21 +0200
|
||
Subject: [PATCH 02/17] apparmor: Fix shadowed local variable in
|
||
unpack_trans_table()
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
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)
|
||
---
|
||
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 c600f4dd1783..2d5a1a007b06 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.11.0
|
||
|