diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:00:01 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:00:01 -0400 |
| commit | f334bcd94b7d3c0fbc34d518a86548f451ab5faf (patch) | |
| tree | 357b0cbd488db581bc9bf710c3696579d21fac03 /security | |
| parent | 73e8fb2d596d5903cde6dcced39c0b88b5770a56 (diff) | |
| parent | 814184fd402557f3e5960db469157ccdf1fb69da (diff) | |
| download | linux-stable-f334bcd94b7d3c0fbc34d518a86548f451ab5faf.tar.gz linux-stable-f334bcd94b7d3c0fbc34d518a86548f451ab5faf.tar.bz2 linux-stable-f334bcd94b7d3c0fbc34d518a86548f451ab5faf.zip | |
Merge remote-tracking branch 'ovl/misc' into work.misc
Diffstat (limited to 'security')
| -rw-r--r-- | security/integrity/ima/ima_appraise.c | 4 | ||||
| -rw-r--r-- | security/integrity/ima/ima_main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index 4b9b4a4e1b89..ef1e4e701780 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -190,7 +190,7 @@ int ima_appraise_measurement(enum ima_hooks func, { static const char op[] = "appraise_data"; char *cause = "unknown"; - struct dentry *dentry = file->f_path.dentry; + struct dentry *dentry = file_dentry(file); struct inode *inode = d_backing_inode(dentry); enum integrity_status status = INTEGRITY_UNKNOWN; int rc = xattr_len, hash_start = 0; @@ -295,7 +295,7 @@ out: */ void ima_update_xattr(struct integrity_iint_cache *iint, struct file *file) { - struct dentry *dentry = file->f_path.dentry; + struct dentry *dentry = file_dentry(file); int rc = 0; /* do not collect and update hash for digital signatures */ diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 596ef616ac21..423d111b3b94 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c @@ -228,7 +228,7 @@ static int process_measurement(struct file *file, char *buf, loff_t size, if ((action & IMA_APPRAISE_SUBMASK) || strcmp(template_desc->name, IMA_TEMPLATE_IMA_NAME) != 0) /* read 'security.ima' */ - xattr_len = ima_read_xattr(file->f_path.dentry, &xattr_value); + xattr_len = ima_read_xattr(file_dentry(file), &xattr_value); hash_algo = ima_get_hash_algo(xattr_value, xattr_len); |