From c009c47ab77544b37ed1149b7ad6d1c403da6cfc Mon Sep 17 00:00:00 2001 From: John Johansen Date: Wed, 22 Feb 2012 00:42:08 -0800 Subject: [PATCH] --- yaml --- r: 292292 b: refs/heads/master c: 38305a4bab4be5d278443b057f7f5e97afb07f26 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/apparmor/file.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 013ea03bac40..96dba20ceabf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b964eae204d791421677ec56b94a7b18cf8740d +refs/heads/master: 38305a4bab4be5d278443b057f7f5e97afb07f26 diff --git a/trunk/security/apparmor/file.c b/trunk/security/apparmor/file.c index 7312db741219..bba875c4d068 100644 --- a/trunk/security/apparmor/file.c +++ b/trunk/security/apparmor/file.c @@ -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)