Commit 989d86ed authored by Hailey Mothershead's avatar Hailey Mothershead Committed by Yi Yang
Browse files

crypto: aead,cipher - zeroize key buffer after use 

mainline inclusion
from mainline-v6.10-rc1
commit 23e4099bdc3c8381992f9eb975c79196d6755210
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAHJG9
CVE: CVE-2024-42229

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=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: default avatarHailey Mothershead <hailmo@amazon.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Conflicts:
	crypto/aead.c
	crypto/cipher.c
[Use kzfree instead of kfree_sensitive because commit 453431a5
("mm, treewide: rename kzfree() to kfree_sensitive()") not merged]
Signed-off-by: default avatarYi Yang <yiyang13@huawei.com>
parent 146a244b

crypto/aead.c

+1 −2
Original line number Diff line number Diff line
@@ -45,8 +45,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);

	kzfree(buffer);

	return ret;

}

crypto/cipher.c

+1 −2
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key, 
	alignbuffer = (u8 *)ALIGN((unsigned long)buffer, alignmask + 1);

	memcpy(alignbuffer, key, keylen);

	ret = cia->cia_setkey(tfm, alignbuffer, keylen);

	memset(alignbuffer, 0, keylen);

	kfree(buffer);

	kzfree(buffer);

	return ret;



}