summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDmitry Kasatkin <d.kasatkin@samsung.com>2014-08-20 12:37:57 +0300
committerMimi Zohar <zohar@linux.vnet.ibm.com>2014-09-09 10:28:51 -0400
commit86f2bc024966d962d4d7575468e226e2269d198c (patch)
tree85f59bd2444364d5e722ba71dd3ca73074757063 /security
parente4a9c5196566bd47ac92f6e5ef7f48412ded7176 (diff)
downloadlinux-86f2bc024966d962d4d7575468e226e2269d198c.tar.gz
linux-86f2bc024966d962d4d7575468e226e2269d198c.tar.bz2
linux-86f2bc024966d962d4d7575468e226e2269d198c.zip
ima: remove unnecessary appraisal test
ima_get_action() sets the "action" flags based on policy. Before collecting, measuring, appraising, or auditing the file, the "action" flag is updated based on the cached iint->flags. This patch removes the subsequent unnecessary appraisal test in ima_appraise_measurement(). Signed-off-by: Dmitry Kasatkin <d.kasatkin@samsung.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security')
-rw-r--r--security/integrity/ima/ima_appraise.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima/ima_appraise.c
index 225fd944a4ef..013ec3f0e42d 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -192,8 +192,6 @@ int ima_appraise_measurement(int func, struct integrity_iint_cache *iint,
enum integrity_status status = INTEGRITY_UNKNOWN;
int rc = xattr_len, hash_start = 0;
- if (!ima_appraise)
- return 0;
if (!inode->i_op->getxattr)
return INTEGRITY_UNKNOWN;