Merge tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

[linux-2.6-microblaze.git] / security / apparmor / file.c

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index 92acf9a..e1b7e93 100644 (file)
--- 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;