Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[firefly-linux-kernel-4.4.55.git] / security / integrity / ima / ima_api.c

diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
index b0dc922d8be3192932a170ad8a8f7b0511bbfaf6..b8a27c5052d40811bcc6741a5b3e264cf2fed529 100644 (file)
--- a/security/integrity/ima/ima_api.c
+++ b/security/integrity/ima/ima_api.c
@@ -195,7 +195,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,
 {
        const char *audit_cause = "failed";
        struct inode *inode = file_inode(file);
-       const char *filename = file->f_dentry->d_name.name;
+       const char *filename = file->f_path.dentry->d_name.name;
        int result = 0;
        struct {
                struct ima_digest_data hdr;
@@ -203,7 +203,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint,
        } hash;
 
        if (xattr_value)
-               *xattr_len = ima_read_xattr(file->f_dentry, xattr_value);
+               *xattr_len = ima_read_xattr(file->f_path.dentry, xattr_value);
 
        if (!(iint->flags & IMA_COLLECTED)) {
                u64 i_version = file_inode(file)->i_version;