apparmor: Fix shadowed local variable in unpack_trans_table()

geertu · jrjohansen · commit 19fe43a54fb6 · 2017-09-22T13:00:57.000-07:00
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: 5379a33 ("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>
diff --git 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;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ static struct aa_dfa unpack_dfa(struct aa_ext e)`
`448`	`448`	`*/`
`449`	`449`	`static bool unpack_trans_table(struct aa_ext e, struct aa_profile profile)`
`450`	`450`	`{`
`451`		`- void *pos = e->pos;`
	`451`	`+ void *saved_pos = e->pos;`
`452`	`452`
`453`	`453`	`/* exec table is optional */`
`454`	`454`	`if (unpack_nameX(e, AA_STRUCT, "xtable")) {`
`@@ -511,7 +511,7 @@ static bool unpack_trans_table(struct aa_ext e, struct aa_profile profile)`
`511`	`511`
`512`	`512`	`fail:`
`513`	`513`	`aa_free_domain_entries(&profile->file.trans);`
`514`		`- e->pos = pos;`
	`514`	`+ e->pos = saved_pos;`
`515`	`515`	`return 0;`
`516`	`516`	`}`
`517`	`517`