Merge tag 'apparmor-v6.2-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

torvalds · torvalds · commit 033c40a89f55 · 2023-02-15T14:53:08.000-08:00
Pull apparmor fix from John Johansen:
 "Regression fix for getattr mediation of old policy"

* tag 'apparmor-v6.2-rc9' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: Fix regression in compat permissions for getattr
diff --git a/security/apparmor/policy_compat.c b/security/apparmor/policy_compat.c
@@ -160,8 +160,7 @@ static struct aa_perms *compute_fperms(struct aa_dfa *dfa)
 	if (!table)
 		return NULL;
 
-	/* zero init so skip the trap state (state == 0) */
-	for (state = 1; state < state_count; state++) {
+	for (state = 0; state < state_count; state++) {
 		table[state * 2] = compute_fperms_user(dfa, state);
 		table[state * 2 + 1] = compute_fperms_other(dfa, state);
 	}

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,7 @@ static struct aa_perms compute_fperms(struct aa_dfa dfa)`
`160`	`160`	`if (!table)`
`161`	`161`	`return NULL;`
`162`	`162`
`163`		`- /* zero init so skip the trap state (state == 0) */`
`164`		`- for (state = 1; state < state_count; state++) {`
	`163`	`+ for (state = 0; state < state_count; state++) {`
`165`	`164`	`table[state * 2] = compute_fperms_user(dfa, state);`
`166`	`165`	`table[state * 2 + 1] = compute_fperms_other(dfa, state);`
`167`	`166`	`}`