From 0efae411280988b43d5e5042aa047eeb276d1dac Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 1 May 2025 20:37:30 +0800 Subject: [PATCH] crypto: acomp - Clone folios properly The folios contain references to the request itself so they must be setup again in the cloned request. Fixes: 5f3437e9c89e ("crypto: acomp - Simplify folio handling") Signed-off-by: Herbert Xu --- crypto/acompress.c | 18 ++++++++++++++++++ include/crypto/acompress.h | 8 ++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/crypto/acompress.c b/crypto/acompress.c index 9dea76ed45135..6ecbfc49bfa86 100644 --- a/crypto/acompress.c +++ b/crypto/acompress.c @@ -566,5 +566,23 @@ int acomp_walk_virt(struct acomp_walk *__restrict walk, } EXPORT_SYMBOL_GPL(acomp_walk_virt); +struct acomp_req *acomp_request_clone(struct acomp_req *req, + size_t total, gfp_t gfp) +{ + struct acomp_req *nreq; + + nreq = container_of(crypto_request_clone(&req->base, total, gfp), + struct acomp_req, base); + if (nreq == req) + return req; + + if (req->src == &req->chain.ssg) + nreq->src = &nreq->chain.ssg; + if (req->dst == &req->chain.dsg) + nreq->dst = &nreq->chain.dsg; + return nreq; +} +EXPORT_SYMBOL_GPL(acomp_request_clone); + MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Asynchronous compression type"); diff --git a/include/crypto/acompress.h b/include/crypto/acompress.h index f1812e92d3e33..9eacb9fa375d7 100644 --- a/include/crypto/acompress.h +++ b/include/crypto/acompress.h @@ -551,11 +551,7 @@ static inline struct acomp_req *acomp_request_on_stack_init( return req; } -static inline struct acomp_req *acomp_request_clone(struct acomp_req *req, - size_t total, gfp_t gfp) -{ - return container_of(crypto_request_clone(&req->base, total, gfp), - struct acomp_req, base); -} +struct acomp_req *acomp_request_clone(struct acomp_req *req, + size_t total, gfp_t gfp); #endif -- 2.47.2