[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 19/22] cryptodisk: wipe out the cached keys from protectors
From: |
Gary Lin |
Subject: |
[PATCH v9 19/22] cryptodisk: wipe out the cached keys from protectors |
Date: |
Mon, 5 Feb 2024 15:39:52 +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.
Signed-off-by: Gary Lin <glin@suse.com>
Cc: Fabian Vogt <fvogt@suse.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 0dbf601c4..94507ec65 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
- [PATCH v9 09/22] tpm2: Add TPM Software Stack (TSS), (continued)
- [PATCH v9 09/22] tpm2: Add TPM Software Stack (TSS), Gary Lin, 2024/02/05
- [PATCH v9 11/22] cryptodisk: Support key protectors, Gary Lin, 2024/02/05
- [PATCH v9 10/22] key_protector: Add TPM2 Key Protector, Gary Lin, 2024/02/05
- [PATCH v9 12/22] util/grub-protect: Add new tool, Gary Lin, 2024/02/05
- [PATCH v9 13/22] tpm2: Add TPM2 types, structures, and command constants, Gary Lin, 2024/02/05
- [PATCH v9 14/22] tpm2: Add more marshal/unmarshal functions, Gary Lin, 2024/02/05
- [PATCH v9 15/22] tpm2: Implement more TPM2 commands, Gary Lin, 2024/02/05
- [PATCH v9 16/22] tpm2: Support authorized policy, Gary Lin, 2024/02/05
- [PATCH v9 17/22] tpm2: Implement NV index, Gary Lin, 2024/02/05
- [PATCH v9 18/22] cryptodisk: Fallback to passphrase, Gary Lin, 2024/02/05
- [PATCH v9 19/22] cryptodisk: wipe out the cached keys from protectors,
Gary Lin <=
- [PATCH v9 21/22] tpm2: Enable tpm2 module for grub-emu, Gary Lin, 2024/02/05
- [PATCH v9 20/22] diskfilter: look up cryptodisk devices first, Gary Lin, 2024/02/05
- [PATCH v9 22/22] tests: Add tpm2_test, Gary Lin, 2024/02/05
- Re: [PATCH v9 00/22] Automatic Disk Unlock with TPM2, Daniel Kiper, 2024/02/08