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

!10892 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/SGQSXPOYBT6AJMAAIEJJOKYBQJELVNV5/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAHJG9 
 
Link:https://gitee.com/openeuler/kernel/pulls/10892

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 4c206d1e 989d86ed

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;



}