summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vorel <pvorel@suse.cz>2018-05-10 17:15:48 +0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2018-05-17 08:03:06 -0400
commit4ecd9934ba1c2edf95588a364d49ddfd85c61bd1 (patch)
tree0fbb856be814fdd582d98d6ae302f70e357fad22
parentde636769c8c7359dacccca61d6c187d864d1d3b8 (diff)
downloadlinux-stable-4ecd9934ba1c2edf95588a364d49ddfd85c61bd1.tar.gz
linux-stable-4ecd9934ba1c2edf95588a364d49ddfd85c61bd1.tar.bz2
linux-stable-4ecd9934ba1c2edf95588a364d49ddfd85c61bd1.zip
ima: Remove unused variable ima_initialized
Commit a756024 ("ima: added ima_policy_flag variable") replaced ima_initialized with ima_policy_flag, but didn't remove ima_initialized. This patch removes it. Signed-off-by: Petr Vorel <pvorel@suse.cz> Reviewed-by: James Morris <james.morris@microsoft.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
-rw-r--r--security/integrity/ima/ima.h1
-rw-r--r--security/integrity/ima/ima_main.c7
2 files changed, 2 insertions, 6 deletions
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 35fe91aa1fc9..354bb5716ce3 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -53,7 +53,6 @@ enum tpm_pcrs { TPM_PCR0 = 0, TPM_PCR8 = 8 };
extern int ima_policy_flag;
/* set during initialization */
-extern int ima_initialized;
extern int ima_used_chip;
extern int ima_hash_algo;
extern int ima_appraise;
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 74d0bd7e76d7..e771b736aa03 100644
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -32,8 +32,6 @@
#include "ima.h"
-int ima_initialized;
-
#ifdef CONFIG_IMA_APPRAISE
int ima_appraise = IMA_APPRAISE_ENFORCE;
#else
@@ -517,10 +515,9 @@ static int __init init_ima(void)
error = ima_init();
}
- if (!error) {
- ima_initialized = 1;
+ if (!error)
ima_update_policy_flag();
- }
+
return error;
}