1 files changed, 19 insertions, 11 deletions

diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index e38a2d61819a..acbbf010222e 100644
--- a/crypto/chacha20poly1305.c
+++ b/crypto/chacha20poly1305.c
@@ -65,6 +65,8 @@ struct chachapoly_req_ctx {
         unsigned int cryptlen;
         /* Actual AD, excluding IV */
         unsigned int assoclen;
+        /* request flags, with MAY_SLEEP cleared if needed */
+        u32 flags;
         union {
                 struct poly_req poly;
                 struct chacha_req chacha;
@@ -74,8 +76,12 @@ struct chachapoly_req_ctx {
 static inline void async_done_continue(struct aead_request *req, int err,
                                        int (*cont)(struct aead_request *))
 {
-        if (!err)
+        if (!err) {
+                struct chachapoly_req_ctx *rctx = aead_request_ctx(req);
+
+                rctx->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
                 err = cont(req);
+        }
 
         if (err != -EINPROGRESS && err != -EBUSY)
                 aead_request_complete(req, err);
@@ -142,7 +148,7 @@ static int chacha_decrypt(struct aead_request *req)
                 dst = scatterwalk_ffwd(rctx->dst, req->dst, req->assoclen);
         }
 
-        skcipher_request_set_callback(&creq->req, aead_request_flags(req),
+        skcipher_request_set_callback(&creq->req, rctx->flags,
                                       chacha_decrypt_done, req);
         skcipher_request_set_tfm(&creq->req, ctx->chacha);
         skcipher_request_set_crypt(&creq->req, src, dst,
@@ -186,7 +192,7 @@ static int poly_tail(struct aead_request *req)
         memcpy(&preq->tail.cryptlen, &len, sizeof(len));
         sg_set_buf(preq->src, &preq->tail, sizeof(preq->tail));
 
-        ahash_request_set_callback(&preq->req, aead_request_flags(req),
+        ahash_request_set_callback(&preq->req, rctx->flags,
                                    poly_tail_done, req);
         ahash_request_set_tfm(&preq->req, ctx->poly);
         ahash_request_set_crypt(&preq->req, preq->src,
@@ -217,7 +223,7 @@ static int poly_cipherpad(struct aead_request *req)
         sg_init_table(preq->src, 1);
         sg_set_buf(preq->src, &preq->pad, padlen);
 
-        ahash_request_set_callback(&preq->req, aead_request_flags(req),
+        ahash_request_set_callback(&preq->req, rctx->flags,
                                    poly_cipherpad_done, req);
         ahash_request_set_tfm(&preq->req, ctx->poly);
         ahash_request_set_crypt(&preq->req, preq->src, NULL, padlen);
@@ -248,7 +254,7 @@ static int poly_cipher(struct aead_request *req)
         sg_init_table(rctx->src, 2);
         crypt = scatterwalk_ffwd(rctx->src, crypt, req->assoclen);
 
-        ahash_request_set_callback(&preq->req, aead_request_flags(req),
+        ahash_request_set_callback(&preq->req, rctx->flags,
                                    poly_cipher_done, req);
         ahash_request_set_tfm(&preq->req, ctx->poly);
         ahash_request_set_crypt(&preq->req, crypt, NULL, rctx->cryptlen);
@@ -278,7 +284,7 @@ static int poly_adpad(struct aead_request *req)
         sg_init_table(preq->src, 1);
         sg_set_buf(preq->src, preq->pad, padlen);
 
-        ahash_request_set_callback(&preq->req, aead_request_flags(req),
+        ahash_request_set_callback(&preq->req, rctx->flags,
                                    poly_adpad_done, req);
         ahash_request_set_tfm(&preq->req, ctx->poly);
         ahash_request_set_crypt(&preq->req, preq->src, NULL, padlen);
@@ -302,7 +308,7 @@ static int poly_ad(struct aead_request *req)
         struct poly_req *preq = &rctx->u.poly;
         int err;
 
-        ahash_request_set_callback(&preq->req, aead_request_flags(req),
+        ahash_request_set_callback(&preq->req, rctx->flags,
                                    poly_ad_done, req);
         ahash_request_set_tfm(&preq->req, ctx->poly);
         ahash_request_set_crypt(&preq->req, req->src, NULL, rctx->assoclen);
@@ -329,7 +335,7 @@ static int poly_setkey(struct aead_request *req)
         sg_init_table(preq->src, 1);
         sg_set_buf(preq->src, rctx->key, sizeof(rctx->key));
 
-        ahash_request_set_callback(&preq->req, aead_request_flags(req),
+        ahash_request_set_callback(&preq->req, rctx->flags,
                                    poly_setkey_done, req);
         ahash_request_set_tfm(&preq->req, ctx->poly);
         ahash_request_set_crypt(&preq->req, preq->src, NULL, sizeof(rctx->key));
@@ -353,7 +359,7 @@ static int poly_init(struct aead_request *req)
         struct poly_req *preq = &rctx->u.poly;
         int err;
 
-        ahash_request_set_callback(&preq->req, aead_request_flags(req),
+        ahash_request_set_callback(&preq->req, rctx->flags,
                                    poly_init_done, req);
         ahash_request_set_tfm(&preq->req, ctx->poly);
 
@@ -391,7 +397,7 @@ static int poly_genkey(struct aead_request *req)
 
         chacha_iv(creq->iv, req, 0);
 
-        skcipher_request_set_callback(&creq->req, aead_request_flags(req),
+        skcipher_request_set_callback(&creq->req, rctx->flags,
                                       poly_genkey_done, req);
         skcipher_request_set_tfm(&creq->req, ctx->chacha);
         skcipher_request_set_crypt(&creq->req, creq->src, creq->src,
@@ -431,7 +437,7 @@ static int chacha_encrypt(struct aead_request *req)
                 dst = scatterwalk_ffwd(rctx->dst, req->dst, req->assoclen);
         }
 
-        skcipher_request_set_callback(&creq->req, aead_request_flags(req),
+        skcipher_request_set_callback(&creq->req, rctx->flags,
                                       chacha_encrypt_done, req);
         skcipher_request_set_tfm(&creq->req, ctx->chacha);
         skcipher_request_set_crypt(&creq->req, src, dst,
@@ -449,6 +455,7 @@ static int chachapoly_encrypt(struct aead_request *req)
         struct chachapoly_req_ctx *rctx = aead_request_ctx(req);
 
         rctx->cryptlen = req->cryptlen;
+        rctx->flags = aead_request_flags(req);
 
         /* encrypt call chain:
          * - chacha_encrypt/done()
@@ -470,6 +477,7 @@ static int chachapoly_decrypt(struct aead_request *req)
         struct chachapoly_req_ctx *rctx = aead_request_ctx(req);
 
         rctx->cryptlen = req->cryptlen - POLY1305_DIGEST_SIZE;
+        rctx->flags = aead_request_flags(req);
 
         /* decrypt call chain:
          * - poly_genkey/done()