* [PATCH] ima: Remove unused variable ima_initialized
@ 2018-05-10 15:15 Petr Vorel
2018-05-10 18:06 ` James Morris
0 siblings, 1 reply; 3+ messages in thread
From: Petr Vorel @ 2018-05-10 15:15 UTC (permalink / raw)
To: linux-integrity; +Cc: Petr Vorel, Mimi Zohar
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
security/integrity/ima/ima.h | 1 -
security/integrity/ima/ima_main.c | 7 ++-----
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;
}
--
2.12.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ima: Remove unused variable ima_initialized
2018-05-10 15:15 [PATCH] ima: Remove unused variable ima_initialized Petr Vorel
@ 2018-05-10 18:06 ` James Morris
2018-05-11 2:24 ` Mimi Zohar
0 siblings, 1 reply; 3+ messages in thread
From: James Morris @ 2018-05-10 18:06 UTC (permalink / raw)
To: Petr Vorel; +Cc: linux-integrity, Mimi Zohar
On Thu, 10 May 2018, Petr Vorel wrote:
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> security/integrity/ima/ima.h | 1 -
> security/integrity/ima/ima_main.c | 7 ++-----
> 2 files changed, 2 insertions(+), 6 deletions(-)
Reviewed-by: James Morris <james.morris@microsoft.com>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ima: Remove unused variable ima_initialized
2018-05-10 18:06 ` James Morris
@ 2018-05-11 2:24 ` Mimi Zohar
0 siblings, 0 replies; 3+ messages in thread
From: Mimi Zohar @ 2018-05-11 2:24 UTC (permalink / raw)
To: James Morris, Petr Vorel; +Cc: linux-integrity
On Fri, 2018-05-11 at 04:06 +1000, James Morris wrote:
> On Thu, 10 May 2018, Petr Vorel wrote:
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>
> > ---
> > security/integrity/ima/ima.h | 1 -
> > security/integrity/ima/ima_main.c | 7 ++-----
> > 2 files changed, 2 insertions(+), 6 deletions(-)
>
>
> Reviewed-by: James Morris <james.morris@microsoft.com>
Thanks.
Mimi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-11 2:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-10 15:15 [PATCH] ima: Remove unused variable ima_initialized Petr Vorel
2018-05-10 18:06 ` James Morris
2018-05-11 2:24 ` Mimi Zohar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.