@@ -141,12 +141,8 @@ static bool acomp_request_has_nondma(struct acomp_req *req)
static void acomp_save_req(struct acomp_req *req, crypto_completion_t cplt)
{
- struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);
struct acomp_req_chain *state = &req->chain;
- if (!acomp_is_async(tfm))
- return;
-
state->compl = req->base.complete;
state->data = req->base.data;
req->base.complete = cplt;
@@ -154,14 +150,9 @@ static void acomp_save_req(struct acomp_req *req, crypto_completion_t cplt)
state->req0 = req;
}
-static void acomp_restore_req(struct acomp_req_chain *state)
+static void acomp_restore_req(struct acomp_req *req)
{
- struct acomp_req *req = state->req0;
- struct crypto_acomp *tfm;
-
- tfm = crypto_acomp_reqtfm(req);
- if (!acomp_is_async(tfm))
- return;
+ struct acomp_req_chain *state = req->base.data;
req->base.complete = state->compl;
req->base.data = state->data;
@@ -207,10 +198,9 @@ static void acomp_virt_to_sg(struct acomp_req *req)
}
}
-static int acomp_reqchain_finish(struct acomp_req_chain *state,
- int err, u32 mask)
+static int acomp_reqchain_finish(struct acomp_req *req0, int err, u32 mask)
{
- struct acomp_req *req0 = state->req0;
+ struct acomp_req_chain *state = req0->base.data;
struct acomp_req *req = state->cur;
struct acomp_req *n;
@@ -243,7 +233,7 @@ static int acomp_reqchain_finish(struct acomp_req_chain *state,
list_add_tail(&req->base.list, &req0->base.list);
}
- acomp_restore_req(state);
+ acomp_restore_req(req0);
out:
return err;
@@ -262,7 +252,8 @@ static void acomp_reqchain_done(void *data, int err)
goto notify;
}
- err = acomp_reqchain_finish(state, err, CRYPTO_TFM_REQ_MAY_BACKLOG);
+ err = acomp_reqchain_finish(state->req0, err,
+ CRYPTO_TFM_REQ_MAY_BACKLOG);
if (err == -EBUSY)
return;
@@ -274,7 +265,7 @@ static int acomp_do_req_chain(struct acomp_req *req,
int (*op)(struct acomp_req *req))
{
struct crypto_acomp *tfm = crypto_acomp_reqtfm(req);
- struct acomp_req_chain *state = &req->chain;
+ struct acomp_req_chain *state;
int err;
if (crypto_acomp_req_chain(tfm) ||
@@ -289,10 +280,8 @@ static int acomp_do_req_chain(struct acomp_req *req,
if (acomp_request_has_nondma(req))
return -EINVAL;
- if (acomp_is_async(tfm)) {
- acomp_save_req(req, acomp_reqchain_done);
- state = req->base.data;
- }
+ acomp_save_req(req, acomp_reqchain_done);
+ state = req->base.data;
state->op = op;
state->cur = req;
@@ -305,7 +294,7 @@ static int acomp_do_req_chain(struct acomp_req *req,
if (err == -EBUSY || err == -EINPROGRESS)
return -EBUSY;
- return acomp_reqchain_finish(state, err, ~0);
+ return acomp_reqchain_finish(req, err, ~0);
}
int crypto_acomp_compress(struct acomp_req *req)
The synchronous acomp fallback code path is broken because the completion code path assumes that the state object is always set but this is only done for asynchronous algorithms. First of all remove the assumption on the completion code path by passing in req0 instead of the state. However, also remove the conditional setting of the state since it's always in the request object anyway. Fixes: b67a02600372 ("crypto: acomp - Add request chaining and virtual addresses") Reported-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> --- crypto/acompress.c | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-)