From 2c3afbb5c7a23886aa960dfab7a8d87235620e49 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 21 Oct 2026 22:44:31 +0000 Subject: [PATCH] fscrypt: Explicitly zeroize sw_secret in error path Explicitly zeroize the sw_secret array in the case where fscrypt_derive_sw_secret() fails, in case anything was written to it. Doesn't really matter, but this came up in a code review. Link: https://patch.msgid.link/20261021224431.2353673-1-ebiggers@kernel.org Signed-off-by: Eric Biggers --- fs/crypto/keyring.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c index 874cc183ee62..09364fddcb7a 100644 --- a/fs/crypto/keyring.c +++ b/fs/crypto/keyring.c @@ -561,8 +561,10 @@ static int add_master_key(struct super_block *sb, if (secret->is_hw_wrapped) { err = fscrypt_derive_sw_secret(sb, secret->bytes, secret->size, sw_secret); - if (err) + if (err) { + memzero_explicit(sw_secret, sizeof(sw_secret)); return err; + } kdf_key = sw_secret; kdf_key_size = sizeof(sw_secret); /*