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

!8054 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/CAD6JOQN2KT6SS5KF4ZQEXRE5F72RW5M/ 
Herbert Xu (1):


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

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 5e2be305 b666cef6

arch/s390/crypto/aes_s390.c

+3 −1
Original line number Diff line number Diff line
@@ -600,7 +600,9 @@ static int ctr_aes_crypt(struct skcipher_request *req) 
	 * final block may be < AES_BLOCK_SIZE, copy only nbytes

	 */

	if (nbytes) {

		cpacf_kmctr(sctx->fc, sctx->key, buf, walk.src.virt.addr,

		memset(buf, 0, AES_BLOCK_SIZE);

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

		cpacf_kmctr(sctx->fc, 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
@@ -676,9 +676,11 @@ static int ctr_paes_crypt(struct skcipher_request *req) 
	 * 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, &param, buf,

					walk.src.virt.addr, AES_BLOCK_SIZE,

					buf, AES_BLOCK_SIZE,

					walk.iv) == AES_BLOCK_SIZE)

				break;

			if (__paes_convert_key(ctx))