Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38305a4b authored by John Johansen's avatar John Johansen
Browse files

AppArmor: fix mapping of META_READ to audit and quiet flags 



The mapping of AA_MAY_META_READ for the allow mask was also being mapped
to the audit and quiet masks. This would result in some operations being
audited when the should not.

This flaw was hidden by the previous audit bug which would drop some
messages that where supposed to be audited.

Signed-off-by: default avatarJohn Johansen <john.johansen@canonical.com>
Acked-by: default avatarKees Cook <kees@ubuntu.com>
parent 8b964eae

security/apparmor/file.c

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,6 @@ static u32 map_old_perms(u32 old) 
	if (old & 0x40)	/* AA_EXEC_MMAP */

		new |= AA_EXEC_MMAP;



	new |= AA_MAY_META_READ;



	return new;

}
@@ -212,6 +210,7 @@ static struct file_perms compute_perms(struct aa_dfa *dfa, unsigned int state, 
		perms.quiet = map_old_perms(dfa_other_quiet(dfa, state));

		perms.xindex = dfa_other_xindex(dfa, state);

	}

	perms.allow |= AA_MAY_META_READ;



	/* change_profile wasn't determined by ownership in old mapping */

	if (ACCEPT_TABLE(dfa)[state] & 0x80000000)