Merge tag 'jfs-3.20' of git://github.com/kleikamp/linux-shaggy

[deliverable/linux.git] / crypto / algif_skcipher.c

diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c
index 37110fd68adfecb84a2b78663c937f6567106da1..6fc12c3fc4b9f6d3684fa6adee6dc1ccdd96c8e3 100644 (file)
--- a/crypto/algif_skcipher.c
+++ b/crypto/algif_skcipher.c
@@ -439,14 +439,13 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
                while (!sg->length)
                        sg++;
 
-               used = ctx->used;
-               if (!used) {
+               if (!ctx->used) {
                        err = skcipher_wait_for_data(sk, flags);
                        if (err)
                                goto unlock;
                }
 
-               used = min_t(unsigned long, used, iov_iter_count(&msg->msg_iter));
+               used = min_t(unsigned long, ctx->used, iov_iter_count(&msg->msg_iter));
 
                used = af_alg_make_sg(&ctx->rsgl, &msg->msg_iter, used);
                err = used;