diff options
| author | Dmitry Kasatkin | 2011-05-06 10:34:17 +0200 |
|---|---|---|
| committer | Mimi Zohar | 2011-07-18 18:29:48 +0200 |
| commit | 24e0198efe0df50034ec1c14b2d7b5bb0f66d54a (patch) | |
| tree | 64f7d23cd7b07dabe826c2a6ed37f7c1842816b2 /security/integrity/evm/evm_main.c | |
| parent | evm: evm_verify_hmac must not return INTEGRITY_UNKNOWN (diff) | |
| download | kernel-qcow2-linux-24e0198efe0df50034ec1c14b2d7b5bb0f66d54a.tar.gz kernel-qcow2-linux-24e0198efe0df50034ec1c14b2d7b5bb0f66d54a.tar.xz kernel-qcow2-linux-24e0198efe0df50034ec1c14b2d7b5bb0f66d54a.zip | |
evm: replace hmac_status with evm_status
We will use digital signatures in addtion to hmac.
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Diffstat (limited to 'security/integrity/evm/evm_main.c')
| -rw-r--r-- | security/integrity/evm/evm_main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/security/integrity/evm/evm_main.c b/security/integrity/evm/evm_main.c index bfe44dff61bb..eb07f9d13c24 100644 --- a/security/integrity/evm/evm_main.c +++ b/security/integrity/evm/evm_main.c @@ -56,8 +56,8 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, struct evm_ima_xattr_data xattr_data; int rc; - if (iint->hmac_status == INTEGRITY_PASS) - return iint->hmac_status; + if (iint->evm_status == INTEGRITY_PASS) + return iint->evm_status; /* if status is not PASS, try to check again - against -ENOMEM */ @@ -71,18 +71,18 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, sizeof xattr_data, GFP_NOFS); if (rc < 0) goto err_out; - iint->hmac_status = INTEGRITY_PASS; - return iint->hmac_status; + iint->evm_status = INTEGRITY_PASS; + return iint->evm_status; err_out: switch (rc) { case -ENODATA: /* file not labelled */ - iint->hmac_status = INTEGRITY_NOLABEL; + iint->evm_status = INTEGRITY_NOLABEL; break; default: - iint->hmac_status = INTEGRITY_FAIL; + iint->evm_status = INTEGRITY_FAIL; } - return iint->hmac_status; + return iint->evm_status; } static int evm_protected_xattr(const char *req_xattr_name) |