Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[cascardo/linux.git] / security / apparmor / file.c

diff --git a/security/apparmor/file.c b/security/apparmor/file.c
index cd21ec5..fdaa50c 100644 (file)
--- a/security/apparmor/file.c
+++ b/security/apparmor/file.c
@@ -449,8 +449,8 @@ int aa_file_perm(int op, struct aa_profile *profile, struct file *file,
                 u32 request)
 {
        struct path_cond cond = {
-               .uid = file->f_path.dentry->d_inode->i_uid,
-               .mode = file->f_path.dentry->d_inode->i_mode
+               .uid = file_inode(file)->i_uid,
+               .mode = file_inode(file)->i_mode
        };
 
        return aa_path_perm(op, profile, &file->f_path, PATH_DELEGATE_DELETED,