summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2016-01-18 18:46:10 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2016-01-19 15:52:09 +0800
commit4f0414e54e4d1893c6f08260693f8ef84c929293 (patch)
tree09b5e55bdd1d609468fccbe31a3812c15ac2a020 /crypto
parente31835ad3abc6809703d3bbd2400bdd6285f8fea (diff)
downloadlinux-4f0414e54e4d1893c6f08260693f8ef84c929293.tar.gz
linux-4f0414e54e4d1893c6f08260693f8ef84c929293.tar.bz2
linux-4f0414e54e4d1893c6f08260693f8ef84c929293.zip
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: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Tested-by: Dmitry Vyukov <dvyukov@google.com>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/algif_skcipher.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index dfff8b0b56df..df86fb47c3ae 100644
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -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);