[PATCH 5.10 073/145] crypto: asym_tpm: correct zero out potential secrets

From: Greg Kroah-Hartman
Date: Mon Jan 11 2021 - 08:26:36 EST


From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

commit f93274ef0fe972c120c96b3207f8fce376231a60 upstream.

The function derive_pub_key() should be calling memzero_explicit()
instead of memset() in case the complier decides to optimize away the
call to memset() because it "knows" no one is going to touch the memory
anymore.

Cc: stable <stable@xxxxxxxxxxxxxxx>
Reported-by: Ilil Blum Shem-Tov <ilil.blum.shem-tov@xxxxxxxxx>
Tested-by: Ilil Blum Shem-Tov <ilil.blum.shem-tov@xxxxxxxxx>
Link: https://lore.kernel.org/r/X8ns4AfwjKudpyfe@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

---
crypto/asymmetric_keys/asym_tpm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/crypto/asymmetric_keys/asym_tpm.c
+++ b/crypto/asymmetric_keys/asym_tpm.c
@@ -354,7 +354,7 @@ static uint32_t derive_pub_key(const voi
memcpy(cur, e, sizeof(e));
cur += sizeof(e);
/* Zero parameters to satisfy set_pub_key ABI. */
- memset(cur, 0, SETKEY_PARAMS_SIZE);
+ memzero_explicit(cur, SETKEY_PARAMS_SIZE);

return cur - buf;
}