diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-03-12 06:33:48 +0100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-03-12 06:33:48 +0100 |
| commit | 33b25335184b33dafddb4a83c27270947e525641 (patch) | |
| tree | 537e9498c9faebd46f513598a212d06fb1c32a23 /security/integrity/ima/ima_appraise.c | |
| parent | security: have cap_dentry_init_security return error (diff) | |
| parent | evm: enable key retention service automatically (diff) | |
| download | linux-33b25335184b33dafddb4a83c27270947e525641.tar.xz linux-33b25335184b33dafddb4a83c27270947e525641.zip | |
Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'security/integrity/ima/ima_appraise.c')
| -rw-r--r-- | security/integrity/ima/ima_appraise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c index 734e9468aca0..291bf0f3a46d 100644 --- a/security/integrity/ima/ima_appraise.c +++ b/security/integrity/ima/ima_appraise.c @@ -177,11 +177,11 @@ int ima_appraise_measurement(int func, struct integrity_iint_cache *iint, struct evm_ima_xattr_data *xattr_value, int xattr_len) { + static const char op[] = "appraise_data"; + char *cause = "unknown"; struct dentry *dentry = file->f_dentry; struct inode *inode = dentry->d_inode; enum integrity_status status = INTEGRITY_UNKNOWN; - const char *op = "appraise_data"; - char *cause = "unknown"; int rc = xattr_len, hash_start = 0; if (!ima_appraise) |