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

!7699 CVE-2023-52669 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yongqiang Liu <liuyongqiang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/MQ6X6EI2BIAAVOX45VDR73EQ2MX2DIEW/ 
Herbert Xu (1):


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9Q9DK 
 
Link:https://gitee.com/openeuler/kernel/pulls/7699

 

Reviewed-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents d2b59308 26603946

arch/s390/crypto/aes_s390.c

+3 −2
Original line number Diff line number Diff line
@@ -727,8 +727,9 @@ static int ctr_aes_crypt(struct blkcipher_desc *desc, unsigned long modifier, 
	 * final block may be < AES_BLOCK_SIZE, copy only nbytes

	 */

	if (nbytes) {

		cpacf_kmctr(sctx->fc | modifier, sctx->key,

			    buf, walk->src.virt.addr,

		memset(buf, 0, AES_BLOCK_SIZE);

		memcpy(buf, walk->src.virt.addr, nbytes);

		cpacf_kmctr(sctx->fc | modifier, sctx->key, buf, buf,

			    AES_BLOCK_SIZE, walk->iv);

		memcpy(walk->dst.virt.addr, buf, nbytes);

		crypto_inc(walk->iv, AES_BLOCK_SIZE);

arch/s390/crypto/paes_s390.c

+3 −1
Original line number Diff line number Diff line
@@ -483,10 +483,12 @@ static int ctr_paes_crypt(struct blkcipher_desc *desc, unsigned long modifier, 
	 * final block may be < AES_BLOCK_SIZE, copy only nbytes

	 */

	if (nbytes) {

		memset(buf, 0, AES_BLOCK_SIZE);

		memcpy(buf, walk->src.virt.addr, nbytes);

		while (1) {

			if (cpacf_kmctr(ctx->fc | modifier,

					ctx->pk.protkey, buf,

					walk->src.virt.addr, AES_BLOCK_SIZE,

					buf, AES_BLOCK_SIZE,

					walk->iv) == AES_BLOCK_SIZE)

				break;

			if (__ctr_paes_set_key(ctx) != 0)