aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2011-12-12 14:59:10 -0600
committerHerbert Xu <herbert@gondor.apana.org.au>2011-12-20 15:20:01 +0800
commit0b2730d8d8b38e009607d5a094d48fcce73af547 (patch)
tree995bc7a5ed2246fedf936e5e254223a632faefce /drivers
parent741e8c2d8177eca656bc015ef83ab84d817edf8c (diff)
downloadlinux-linaro-stable-0b2730d8d8b38e009607d5a094d48fcce73af547.tar.gz
crypto: talitos - fix bad kfree
Fix a kfree to an invalid address which causes an oops when running on SEC v2.0 h/w (introduced in commit 702331b "crypto: talitos - add hmac algorithms"). Signed-off-by: Kim Phillips <kim.phillips@freescale.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/crypto/talitos.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 230509e9602b..d376cc7c5e8f 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -2626,8 +2626,10 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
alg = &t_alg->algt.alg.hash.halg.base;
alg->cra_init = talitos_cra_init_ahash;
if (!(priv->features & TALITOS_FTR_HMAC_OK) &&
- !strncmp(alg->cra_name, "hmac", 4))
+ !strncmp(alg->cra_name, "hmac", 4)) {
+ kfree(t_alg);
return ERR_PTR(-ENOTSUPP);
+ }
if (!(priv->features & TALITOS_FTR_SHA224_HWINIT) &&
(!strcmp(alg->cra_name, "sha224") ||
!strcmp(alg->cra_name, "hmac(sha224)"))) {
@@ -2835,10 +2837,8 @@ static int talitos_probe(struct platform_device *ofdev)
t_alg = talitos_alg_alloc(dev, &driver_algs[i]);
if (IS_ERR(t_alg)) {
err = PTR_ERR(t_alg);
- if (err == -ENOTSUPP) {
- kfree(t_alg);
+ if (err == -ENOTSUPP)
continue;
- }
goto err_out;
}