Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f0414e5 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: algif_skcipher - Load TX SG list after waiting 



We need to load the TX SG list in sendmsg(2) after waiting for
incoming data, not before.

Cc: stable@vger.kernel.org
Reported-by: default avatarDmitry Vyukov <dvyukov@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Tested-by: default avatarDmitry Vyukov <dvyukov@google.com>
parent e31835ad

crypto/algif_skcipher.c

+7 −7
Original line number Diff line number Diff line
@@ -647,13 +647,6 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg, 


	lock_sock(sk);

	while (msg_data_left(msg)) {

		sgl = list_first_entry(&ctx->tsgl,

				       struct skcipher_sg_list, list);

		sg = sgl->sg;



		while (!sg->length)

			sg++;



		if (!ctx->used) {

			err = skcipher_wait_for_data(sk, flags);

			if (err)
@@ -674,6 +667,13 @@ static int skcipher_recvmsg_sync(struct socket *sock, struct msghdr *msg, 
		if (!used)

			goto free;



		sgl = list_first_entry(&ctx->tsgl,

				       struct skcipher_sg_list, list);

		sg = sgl->sg;



		while (!sg->length)

			sg++;



		skcipher_request_set_crypt(&ctx->req, sg, ctx->rsgl.sg, used,

					   ctx->iv);