Commit 033c40a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 3402351a cbb13e12

security/apparmor/policy_compat.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}