From f6679b4b0c81105e283c61cbe57340d83e69bdad Mon Sep 17 00:00:00 2001 From: Kim Phillips Date: Thu, 17 Jul 2008 20:20:06 +0800 Subject: [PATCH] --- yaml --- r: 106497 b: refs/heads/master c: fa86a26795b850cdf4e557898457a63e241c1aa1 h: refs/heads/master i: 106495: 875b556c2a6c4cb2319b38607585bd7a1a584c3a v: v3 --- [refs] | 2 +- trunk/drivers/crypto/talitos.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8475f0cebbc2..59cf25aca362 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 586725f8604ef16ebbfdd66e73036e162ae00135 +refs/heads/master: fa86a26795b850cdf4e557898457a63e241c1aa1 diff --git a/trunk/drivers/crypto/talitos.c b/trunk/drivers/crypto/talitos.c index 79fdba2a20c0..a81265bbb897 100644 --- a/trunk/drivers/crypto/talitos.c +++ b/trunk/drivers/crypto/talitos.c @@ -880,7 +880,7 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq, unsigned int cryptlen = areq->cryptlen; unsigned int authsize = ctx->authsize; unsigned int ivsize; - int sg_count; + int sg_count, ret; /* hmac key */ map_single_talitos_ptr(dev, &desc->ptr[0], ctx->authkeylen, &ctx->key, @@ -984,7 +984,12 @@ static int ipsec_esp(struct ipsec_esp_edesc *edesc, struct aead_request *areq, map_single_talitos_ptr(dev, &desc->ptr[6], ivsize, ctx->iv, 0, DMA_FROM_DEVICE); - return talitos_submit(dev, desc, callback, areq); + ret = talitos_submit(dev, desc, callback, areq); + if (ret != -EINPROGRESS) { + ipsec_esp_unmap(dev, edesc, areq); + kfree(edesc); + } + return ret; }