]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
crypto: pcrypt - restore callback for non-parallel fallback
authorRuijie Li <ruijieli51@gmail.com>
Mon, 25 May 2026 11:45:21 +0000 (19:45 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 5 Jun 2026 11:36:35 +0000 (19:36 +0800)
pcrypt installs pcrypt_aead_done() on the child AEAD request before
trying to submit it through padata.  If padata_do_parallel() returns
-EBUSY, pcrypt falls back to calling the child AEAD directly.

That fallback must not keep the padata completion callback.  Otherwise
an asynchronous completion runs pcrypt_aead_done() even though the
request was never enrolled in padata.

Restore the original request callback and callback data before calling
the child AEAD directly.  This keeps the fallback path aligned with a
direct AEAD request while leaving the parallel path unchanged.

Fixes: 662f2f13e66d ("crypto: pcrypt - Call crypto layer directly when padata_do_parallel() return -EBUSY")
Cc: stable@kernel.org
Reported-by: Yuan Tan <yuantan098@gmail.com>
Reported-by: Yifan Wu <yifanwucs@gmail.com>
Reported-by: Juefei Pu <tomapufckgml@gmail.com>
Reported-by: Zhengchuan Liang <zcliangcn@gmail.com>
Reported-by: Xin Liu <bird@lzu.edu.cn>
Assisted-by: Codex:gpt-5.4
Signed-off-by: Ruijie Li <ruijieli51@gmail.com>
Signed-off-by: Ren Wei <n05ec@lzu.edu.cn>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/pcrypt.c

index ed0feaba2383233d07f01f633cb12eb244a26d30..9f372442981e65a1f4ed763c1b7aabb4d88b1309 100644 (file)
@@ -122,6 +122,8 @@ static int pcrypt_aead_encrypt(struct aead_request *req)
                return -EINPROGRESS;
        if (err == -EBUSY) {
                /* try non-parallel mode */
+               aead_request_set_callback(creq, flags, req->base.complete,
+                                         req->base.data);
                return crypto_aead_encrypt(creq);
        }
 
@@ -173,6 +175,8 @@ static int pcrypt_aead_decrypt(struct aead_request *req)
                return -EINPROGRESS;
        if (err == -EBUSY) {
                /* try non-parallel mode */
+               aead_request_set_callback(creq, flags, req->base.complete,
+                                         req->base.data);
                return crypto_aead_decrypt(creq);
        }