2022-05-14 04:05:49

by Stefan Berger

Subject: [PATCH] evm: Clean up some variables

Make hmac_tfm static since it's not used anywhere else besides the file
it is in.

Remove declaration of hash_tfm since it doesn't exist.

Signed-off-by: Stefan Berger <[email protected]>
---
security/integrity/evm/evm.h | 3 ---
security/integrity/evm/evm_crypto.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/security/integrity/evm/evm.h b/security/integrity/evm/evm.h
index 0d44f41d16f8..f8b8c5004fc7 100644
--- a/security/integrity/evm/evm.h
+++ b/security/integrity/evm/evm.h
@@ -38,9 +38,6 @@ extern int evm_initialized;

extern int evm_hmac_attrs;

-extern struct crypto_shash *hmac_tfm;
-extern struct crypto_shash *hash_tfm;
-
/* List of EVM protected security xattrs */
extern struct list_head evm_config_xattrnames;

diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index 0450d79afdc8..a733aff02006 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -26,7 +26,7 @@
static unsigned char evmkey[MAX_KEY_SIZE];
static const int evmkey_len = MAX_KEY_SIZE;

-struct crypto_shash *hmac_tfm;
+static struct crypto_shash *hmac_tfm;
static struct crypto_shash *evm_tfm[HASH_ALGO__LAST];

static DEFINE_MUTEX(mutex);
--
2.35.1

2022-05-16 19:54:19

by Stefan Berger

Subject: Re: [PATCH] evm: Clean up some variables

On 5/16/22 10:50, Mimi Zohar wrote:
> On Fri, 2022-05-13 at 13:41 -0400, Stefan Berger wrote:
>> Make hmac_tfm static since it's not used anywhere else besides the file
>> it is in.
>>
>> Remove declaration of hash_tfm since it doesn't exist.
>>
>> Signed-off-by: Stefan Berger <[email protected]>
>
> Thanks, Stefan. Both this patch and "evm: Return INTEGRITY_PASS for
> enum integrity_status value '0'" are now queued in next-integrity.
>
> Mimi
>

There's also this one here:

https://lore.kernel.org/all/[email protected]/

2022-05-17 01:28:53

by Mimi Zohar

Subject: Re: [PATCH] evm: Clean up some variables

On Mon, 2022-05-16 at 11:27 -0400, Stefan Berger wrote:
>
> On 5/16/22 10:50, Mimi Zohar wrote:
> > On Fri, 2022-05-13 at 13:41 -0400, Stefan Berger wrote:
> >> Make hmac_tfm static since it's not used anywhere else besides the file
> >> it is in.
> >>
> >> Remove declaration of hash_tfm since it doesn't exist.
> >>
> >> Signed-off-by: Stefan Berger <[email protected]>
> >
> > Thanks, Stefan. Both this patch and "evm: Return INTEGRITY_PASS for
> > enum integrity_status value '0'" are now queued in next-integrity.
> >
> > Mimi
> >
>
> There's also this one here:
>
> https://lore.kernel.org/all/[email protected]/

Thanks for the reminder. It's now queued in next-integrity.

Mimi

2022-05-17 02:58:09

by Mimi Zohar

Subject: Re: [PATCH] evm: Clean up some variables

On Fri, 2022-05-13 at 13:41 -0400, Stefan Berger wrote:
> Make hmac_tfm static since it's not used anywhere else besides the file
> it is in.
>
> Remove declaration of hash_tfm since it doesn't exist.
>
> Signed-off-by: Stefan Berger <[email protected]>

Thanks, Stefan. Both this patch and "evm: Return INTEGRITY_PASS for
enum integrity_status value '0'" are now queued in next-integrity.

Mimi