Commit 78b0a019 authored by Herbert Xu's avatar Herbert Xu Committed by Kamal Mostafa

crypto: algif_skcipher - Load TX SG list after waiting

commit 4f0414e5 upstream.

We need to load the TX SG list in sendmsg(2) after waiting for
incoming data, not before.
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>
[ kamal: backport to 3.19-stable: context ]
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent 51006a38
...@@ -439,13 +439,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, ...@@ -439,13 +439,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
char __user *from = iov->iov_base; char __user *from = iov->iov_base;
while (seglen) { while (seglen) {
sgl = list_first_entry(&ctx->tsgl,
struct skcipher_sg_list, list);
sg = sgl->sg;
while (!sg->length)
sg++;
if (!ctx->used) { if (!ctx->used) {
err = skcipher_wait_for_data(sk, flags); err = skcipher_wait_for_data(sk, flags);
if (err) if (err)
...@@ -466,6 +459,13 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock, ...@@ -466,6 +459,13 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
if (!used) if (!used)
goto free; goto free;
sgl = list_first_entry(&ctx->tsgl,
struct skcipher_sg_list, list);
sg = sgl->sg;
while (!sg->length)
sg++;
ablkcipher_request_set_crypt(&ctx->req, sg, ablkcipher_request_set_crypt(&ctx->req, sg,
ctx->rsgl.sg, used, ctx->rsgl.sg, used,
ctx->iv); ctx->iv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment