aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2008-07-17 20:20:06 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2008-07-17 20:20:06 +0800
commitfa86a26795b850cdf4e557898457a63e241c1aa1 (patch)
tree1aa60aa057b999d8ae25b1a9812fa6ea5afe438b /drivers/crypto
parent586725f8604ef16ebbfdd66e73036e162ae00135 (diff)
downloadkernel_samsung_tuna-fa86a26795b850cdf4e557898457a63e241c1aa1.zip
kernel_samsung_tuna-fa86a26795b850cdf4e557898457a63e241c1aa1.tar.gz
kernel_samsung_tuna-fa86a26795b850cdf4e557898457a63e241c1aa1.tar.bz2
crypto: talitos - Stop leaking memory in error path
free edescriptor when returning error (such as -EAGAIN). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Acked-by: Lee Nipper <lee.nipper@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/talitos.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 79fdba2..a81265b 100644
--- a/drivers/crypto/talitos.c
+++ b/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;
}