dm-crypt: fix a bug in async cryption complete function
PATCH 1/1 dm-crypt: fix a bug in async cryption complete function
From: Huang Ying <[email protected]>
In async cryption complete function (kcryptd_async_done), the crypto_async_request passed in may be different from the one passed to crypto_ablkcipher_encrypt/decrypt. Only crypto_async_request->data is guaranteed to be same as the passed in one. Current kcryptd_async_done uses passed in crypto_async_request directly, which may cause AES-NI based AES algorithm implementation panic.
This patch fixes this bug by using crypto_async_request->data only, which point to dm_crypt_request, the crypto_async_request passed in and original data (convert_context) can be gotten from dm_crypt_request.
[[email protected]: reworked]
Signed-off-by Huang Ying <[email protected]>
Cc Herbert Xu <[email protected]>
Cc Milan Broz <[email protected]>
Cc Alasdair G Kergon <[email protected]>
Signed-off-by Milan Broz <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/md/dm-crypt.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)
drivers/md/dm-crypt.c renamed from drivers/md/dm-crypt.c~dm-crypt-fix-a-bug-of-async-cryption-complete-function +21 -5
@@ -60,6 +60,7 @@ struct dm_crypt_io { };struct dm_crypt_request { +struct convert_context *ctx;struct scatterlist sg_in;struct scatterlist sg_out; };
@@ -335,6 +336,18 @@ static void crypt_convert_init(struct crinit_completion (&ctx->restart); } +static struct dm_crypt_request *dmreq_of_req (struct crypt_config *cc, +struct ablkcipher_request *req) +{ +return (struct dm_crypt_request *)((char *)req + cc->dmreq_start); +} + +static struct ablkcipher_request *req_of_dmreq (struct crypt_config *cc, +struct dm_crypt_request *dmreq) +{ +return (struct ablkcipher_request *)((char *)dmreq - cc->dmreq_start); +} +static int crypt_convert_block (struct crypt_config *cc,struct convert_context *ctx,struct ablkcipher_request *req)
@@ -345,10 +358,11 @@ static int crypt_convert_block(struct cru8 *iv;int r =0 ; - dmreq = (struct dm_crypt_request *)((char *)req + cc->dmreq_start); + dmreq =dmreq_of_req (cc, req); iv = (u8 *)ALIGN ((unsigned long )(dmreq +1 ),crypto_ablkcipher_alignmask (cc->tfm) +1 ); + dmreq->ctx = ctx;sg_init_table (&dmreq->sg_in,1 );sg_set_page (&dmreq->sg_in, bv_in->bv_page,1 <<SECTOR_SHIFT , bv_in->bv_offset + ctx->offset_in);
@@ -395,8 +409,9 @@ static void crypt_alloc_req(struct crypt cc->req =mempool_alloc (cc->req_pool,GFP_NOIO );ablkcipher_request_set_tfm (cc->req, cc->tfm);ablkcipher_request_set_callback (cc->req,CRYPTO_TFM_REQ_MAY_BACKLOG | -CRYPTO_TFM_REQ_MAY_SLEEP , - kcryptd_async_done, ctx); +CRYPTO_TFM_REQ_MAY_SLEEP , + kcryptd_async_done, +dmreq_of_req (cc, cc->req)); }/*
@@ -821,7 +836,8 @@ static void kcryptd_crypt_read_convert(sstatic void kcryptd_async_done (struct crypto_async_request *async_req,int error) { -struct convert_context *ctx = async_req->data; +struct dm_crypt_request *dmreq = async_req->data; +struct convert_context *ctx = dmreq->ctx; struct dm_crypt_io *io = container_of(ctx, struct dm_crypt_io, ctx);struct crypt_config *cc = io->target->private;
@@ -830,7 +846,7 @@ static void kcryptd_async_done(struct crreturn ; } -mempool_free (ablkcipher_request_cast (async_req), cc->req_pool); +mempool_free (req_of_dmreq (cc, dmreq), cc->req_pool);if (!atomic_dec_and_test (&ctx->pending))return ;
_