Unverified Commit fa9917ed authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10884 crypto: aead,cipher - zeroize key buffer after use 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RMNMHQRES7DKZQN5OO7YWKPYLRY53QOM/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAHJG9 
 
Link:https://gitee.com/openeuler/kernel/pulls/10884

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 34830cbb c574af16

crypto/aead.c

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

}

crypto/cipher.c

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



}