summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-01-01 05:44:50 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2008-01-10 22:17:00 +0100
commit1b87887d6c232becba77835b29a424cf78442b7d (patch)
tree0580c28ba6f4bc08caa847d26d9ac3f87046f4eb /crypto
parent[CRYPTO] tcrypt: Zero axbuf in the right function (diff)
downloadlinux-1b87887d6c232becba77835b29a424cf78442b7d.tar.xz
linux-1b87887d6c232becba77835b29a424cf78442b7d.zip
[CRYPTO] xcbc: Fix algorithm leak when block size check fails
When the underlying algorithm has a block size other than 16 we abort without freeing it. In fact, we try to return the algorithm itself as an error! This patch plugs the leak and makes it return -EINVAL instead. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/xcbc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index 789cdeee6b7d..e3d9503a034b 100644
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -307,7 +307,8 @@ static struct crypto_instance *xcbc_alloc(struct rtattr **tb)
case 16:
break;
default:
- return ERR_PTR(PTR_ERR(alg));
+ inst = ERR_PTR(-EINVAL);
+ goto out_put_alg;
}
inst = crypto_alloc_instance("xcbc", alg);