X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=security%2Fapparmor%2Ffile.c;h=e1b7e93602e4c8d391db3192c5857522eb7f43a5;hb=5c2e7a0af211cb7a3a24fcfe98f0ceb67560b53b;hp=92acf9a49405c4cbc23132e90b738f2c6bd43681;hpb=e30942859030199dab5ad73f95faac226133c639;p=linux-2.6-microblaze.git

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index 92acf9a49405..e1b7e93602e4 100644
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -11,6 +11,8 @@
 #include <linux/tty.h>
 #include <linux/fdtable.h>
 #include <linux/file.h>
+#include <linux/fs.h>
+#include <linux/mount.h>
 
 #include "include/apparmor.h"
 #include "include/audit.h"
@@ -509,7 +511,7 @@ static int __file_path_perm(const char *op, struct aa_label *label,
 	struct aa_profile *profile;
 	struct aa_perms perms = {};
 	struct path_cond cond = {
-		.uid = file_inode(file)->i_uid,
+		.uid = i_uid_into_mnt(file_mnt_user_ns(file), file_inode(file)),
 		.mode = file_inode(file)->i_mode
 	};
 	char *buffer;