diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-10-18 12:31:07 +0800 |
| commit | a66f9577c6e5280d83d45152aea29cf5e4548858 (patch) | |
| tree | ebb42fa6ef16a535adbd5acb8cc79bdd2980da24 /security/integrity/ima/ima_api.c | |
| parent | 26700159745df7db2bc75e8032d2a36913c37880 (diff) | |
| parent | 2308e34317c8cc7beb03a3d18dc39d32015eff06 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'security/integrity/ima/ima_api.c')
| -rw-r--r-- | security/integrity/ima/ima_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c index 1d950fbb2aec..2d1fe34781fa 100644 --- a/security/integrity/ima/ima_api.c +++ b/security/integrity/ima/ima_api.c @@ -202,7 +202,7 @@ int ima_collect_measurement(struct integrity_iint_cache *iint, } hash; if (xattr_value) - *xattr_len = ima_read_xattr(file->f_path.dentry, xattr_value); + *xattr_len = ima_read_xattr(file_dentry(file), xattr_value); if (!(iint->flags & IMA_COLLECTED)) { u64 i_version = file_inode(file)->i_version; |