From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 651D427713; Tue, 9 Jul 2024 11:28:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720524518; cv=none; b=khKl17GmFjfSm2g8CjX6GMMO2WT9KuYw0PhgGRC793B4zKnYdtLkjOzaRYkllkEvwWiTILmVc2Q/3Fp1BOyThxYOPsR5Wuo5DghYrCx/Fefr7sR53ir5pXe0tOUpzhScom/VbdX039vbJnPRDk59T3kioKK4w40diUW7dfidWoc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720524518; c=relaxed/simple; bh=lNzoCmUsammZA44XtcNKb4Zv/5LAPeMoZ25ZzT4Mmpg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VBVF1fmXWNJI3h14UGnJrQAr9wpTCns6ttd3C9NnoImSaABsgJn8ZDxaWwqrEDRl1pXRoRiEyDgmhXq0E0zGlyR9+nbQJkMCpQmUUqGBipHXImRbiRbKkCdGu5vgPRb6A/BvapPrI5p95axjo3xJO+FZDtErNUCF6cB3tG3+vpc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PwePIMM0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PwePIMM0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBA8FC3277B; Tue, 9 Jul 2024 11:28:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720524518; bh=lNzoCmUsammZA44XtcNKb4Zv/5LAPeMoZ25ZzT4Mmpg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PwePIMM02gZUA3TmSIJK8F1L6K3e4G1oh/mEgnfkhaWyifPChKJBu4GpFKLIx8XoW C59qgIuldXw2/D5nHDVzwyMDBvBGWeu8LzocreBvgq8RzdUu75TxeI/ZyJ6EkykvQp tCgNfpJS2LubkSX9Bo5Qc02+VmnCKF7Xo9tZyFOw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hailey Mothershead , Herbert Xu , Sasha Levin Subject: [PATCH 6.1 010/102] crypto: aead,cipher - zeroize key buffer after use Date: Tue, 9 Jul 2024 13:09:33 +0200 Message-ID: <20240709110651.763596124@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709110651.353707001@linuxfoundation.org> References: <20240709110651.353707001@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hailey Mothershead [ Upstream commit 23e4099bdc3c8381992f9eb975c79196d6755210 ] I.G 9.7.B for FIPS 140-3 specifies that variables temporarily holding cryptographic information should be zeroized once they are no longer needed. Accomplish this by using kfree_sensitive for buffers that previously held the private key. Signed-off-by: Hailey Mothershead Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- crypto/aead.c | 3 +-- crypto/cipher.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/crypto/aead.c b/crypto/aead.c index 16991095270d2..c4ece86c45bc4 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -35,8 +35,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key, alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); memcpy(alignbuffer, key, keylen); ret = crypto_aead_alg(tfm)->setkey(tfm, alignbuffer, keylen); - memset(alignbuffer, 0, keylen); - kfree(buffer); + kfree_sensitive(buffer); return ret; } diff --git a/crypto/cipher.c b/crypto/cipher.c index b47141ed4a9f3..395f0c2fbb9ff 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -34,8 +34,7 @@ static int setkey_unaligned(struct crypto_cipher *tfm, const u8 *key, alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1); memcpy(alignbuffer, key, keylen); ret = cia->cia_setkey(crypto_cipher_tfm(tfm), alignbuffer, keylen); - memset(alignbuffer, 0, keylen); - kfree(buffer); + kfree_sensitive(buffer); return ret; } -- 2.43.0