Attachment 311688 Details for Bug 455238 – crypto: chainiv - Invoke completion function

[patch] crypto: chainiv - Invoke completion function

p (text/plain), 1.58 KB, created by Herbert Xu on 2008-07-14 11:35:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herbert Xu

Created: 2008-07-14 11:35:39 UTC

Size: 1.58 KB

patch

obsolete

>crypto: chainiv - Invoke completion function
>
>[ Upstream commit: 066068afee313b7746e7a3de05b57dcd4149a2fe ]
>    
>When chainiv postpones requests it never calls their completion functions.
>This causes symptoms such as memory leaks when IPsec is in use.
>
>Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>
>diff --git a/crypto/chainiv.c b/crypto/chainiv.c
>index 6da3f57..9affade 100644
>--- a/crypto/chainiv.c
>+++ b/crypto/chainiv.c
>@@ -117,6 +117,7 @@ static int chainiv_init(struct crypto_tfm *tfm)
> static int async_chainiv_schedule_work(struct async_chainiv_ctx *ctx)
> {
> 	int queued;
>+	int err = ctx->err;
> 
> 	if (!ctx->queue.qlen) {
> 		smp_mb__before_clear_bit();
>@@ -131,7 +132,7 @@ static int async_chainiv_schedule_work(struct async_chainiv_ctx *ctx)
> 	BUG_ON(!queued);
> 
> out:
>-	return ctx->err;
>+	return err;
> }
> 
> static int async_chainiv_postpone_request(struct skcipher_givcrypt_request *req)
>@@ -227,6 +228,7 @@ static void async_chainiv_do_postponed(struct work_struct *work)
> 						     postponed);
> 	struct skcipher_givcrypt_request *req;
> 	struct ablkcipher_request *subreq;
>+	int err;
> 
> 	/* Only handle one request at a time to avoid hogging keventd. */
> 	spin_lock_bh(&ctx->lock);
>@@ -241,7 +243,11 @@ static void async_chainiv_do_postponed(struct work_struct *work)
> 	subreq = skcipher_givcrypt_reqctx(req);
> 	subreq->base.flags |= CRYPTO_TFM_REQ_MAY_SLEEP;
> 
>-	async_chainiv_givencrypt_tail(req);
>+	err = async_chainiv_givencrypt_tail(req);
>+
>+	local_bh_disable();
>+	skcipher_givcrypt_complete(req, err);
>+	local_bh_enable();
> }
> 
> static int async_chainiv_init(struct crypto_tfm *tfm)
>

Actions: View | Diff

Attachments on bug 455238: 311688