crypto: talitos - fix bad kfree
authorKim Phillips <kim.phillips@freescale.com>
Mon, 12 Dec 2011 20:59:10 +0000 (14:59 -0600)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 20 Dec 2011 07:20:01 +0000 (15:20 +0800)
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>
drivers/crypto/talitos.c

index 230509e..d376cc7 100644 (file)
@@ -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;
                        }