Merge tag 'apparmor-pr-2022-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / security / apparmor / file.c

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index deb73480f0c65cee6d3adadd3ab36bd026a2cf41..cb3d3060d1049b24e4f948e182ee0258991f4a34 100644 (file)
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -459,8 +459,10 @@ static int __file_path_perm(const char *op, struct aa_label *label,
 {
        struct aa_profile *profile;
        struct aa_perms perms = {};
+       vfsuid_t vfsuid = i_uid_into_vfsuid(file_mnt_user_ns(file),
+                                           file_inode(file));
        struct path_cond cond = {
-               .uid = i_uid_into_mnt(file_mnt_user_ns(file), file_inode(file)),
+               .uid = vfsuid_into_kuid(vfsuid),
                .mode = file_inode(file)->i_mode
        };
        char *buffer;