[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v12 17/20] cryptodisk: wipe out the cached keys from protectors
From: |
Gary Lin |
Subject: |
[PATCH v12 17/20] cryptodisk: wipe out the cached keys from protectors |
Date: |
Fri, 19 Apr 2024 16:31:01 +0800 |
An attacker may insert a malicious disk with the same crypto UUID and
trick grub2 to mount the fake root. Even though the key from the key
protector fails to unlock the fake root, it's not wiped out cleanly so
the attacker could dump the memory to retrieve the secret key. To defend
such attack, wipe out the cached key when we don't need it.
Cc: Fabian Vogt <fvogt@suse.com>
Signed-off-by: Gary Lin <glin@suse.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
---
grub-core/disk/cryptodisk.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 8f00f22a8..3b19f2d2d 100644
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -1349,7 +1349,11 @@ grub_cryptodisk_clear_key_cache (struct
grub_cryptomount_args *cargs)
return;
for (i = 0; cargs->protectors[i]; i++)
- grub_free (cargs->key_cache[i].key);
+ {
+ if (cargs->key_cache[i].key)
+ grub_memset (cargs->key_cache[i].key, 0, cargs->key_cache[i].key_len);
+ grub_free (cargs->key_cache[i].key);
+ }
grub_free (cargs->key_cache);
}
--
2.35.3
- Re: [PATCH v12 20/20] tests: Add tpm2_test, (continued)
- [PATCH v12 11/20] key_protector: Add TPM2 Key Protector, Gary Lin, 2024/04/19
- [PATCH v12 07/20] asn1_test: test module for libtasn1, Gary Lin, 2024/04/19
- [PATCH v12 08/20] libtasn1: Add the documentation, Gary Lin, 2024/04/19
- [PATCH v12 12/20] cryptodisk: Support key protectors, Gary Lin, 2024/04/19
- [PATCH v12 13/20] util/grub-protect: Add new tool, Gary Lin, 2024/04/19
- [PATCH v12 17/20] cryptodisk: wipe out the cached keys from protectors,
Gary Lin <=
- [PATCH v12 14/20] tpm2: Support authorized policy, Gary Lin, 2024/04/19
- [PATCH v12 19/20] tpm2: Enable tpm2 module for grub-emu, Gary Lin, 2024/04/19
- [PATCH v12 15/20] tpm2: Implement NV index, Gary Lin, 2024/04/19
- [PATCH v12 16/20] cryptodisk: Fallback to passphrase, Gary Lin, 2024/04/19