Commit d8be5a55 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.8-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fix from Herbert Xu:
 "Fix a stack overflow in virtio"

* tag 'v6.8-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: virtio/akcipher - Fix stack overflow on memcpy
parents 9fc1cccc c0ec2a71

drivers/crypto/virtio/virtio_crypto_akcipher_algs.c

+3 −2
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ static void virtio_crypto_dataq_akcipher_callback(struct virtio_crypto_request * 
}



static int virtio_crypto_alg_akcipher_init_session(struct virtio_crypto_akcipher_ctx *ctx,

		struct virtio_crypto_ctrl_header *header, void *para,

		struct virtio_crypto_ctrl_header *header,

		struct virtio_crypto_akcipher_session_para *para,

		const uint8_t *key, unsigned int keylen)

{

	struct scatterlist outhdr_sg, key_sg, inhdr_sg, *sgs[3];
@@ -128,7 +129,7 @@ static int virtio_crypto_alg_akcipher_init_session(struct virtio_crypto_akcipher 


	ctrl = &vc_ctrl_req->ctrl;

	memcpy(&ctrl->header, header, sizeof(ctrl->header));

	memcpy(&ctrl->u, para, sizeof(ctrl->u));

	memcpy(&ctrl->u.akcipher_create_session.para, para, sizeof(*para));

	input = &vc_ctrl_req->input;

	input->status = cpu_to_le32(VIRTIO_CRYPTO_ERR);