diff options
author | Dan Carpenter <error27@gmail.com> | 2010-03-24 09:35:23 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2010-03-24 09:35:23 -0400 |
commit | 80a6d7db9fa06c29c89ccce0374870ac64a81d3f (patch) | |
tree | 97f523a9d5e18028c37e06bbd32d538c9328a150 | |
parent | 304a204ec9d4b9b31f3491e736bfbba44feaa1b0 (diff) |
crypto: pcrypt - Handle crypto_get_attr_type errors
I was concerned about the error handling for crypto_get_attr_type() in
pcrypt_alloc_aead(). Steffen Klassert pointed out that we could simply
avoid calling crypto_get_attr_type() if we passed the type and mask as a
parameters.
Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r-- | crypto/pcrypt.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c index 80201241b698..247178cb98ec 100644 --- a/crypto/pcrypt.c +++ b/crypto/pcrypt.c | |||
@@ -315,16 +315,13 @@ out_free_inst: | |||
315 | goto out; | 315 | goto out; |
316 | } | 316 | } |
317 | 317 | ||
318 | static struct crypto_instance *pcrypt_alloc_aead(struct rtattr **tb) | 318 | static struct crypto_instance *pcrypt_alloc_aead(struct rtattr **tb, |
319 | u32 type, u32 mask) | ||
319 | { | 320 | { |
320 | struct crypto_instance *inst; | 321 | struct crypto_instance *inst; |
321 | struct crypto_alg *alg; | 322 | struct crypto_alg *alg; |
322 | struct crypto_attr_type *algt; | ||
323 | |||
324 | algt = crypto_get_attr_type(tb); | ||
325 | 323 | ||
326 | alg = crypto_get_attr_alg(tb, algt->type, | 324 | alg = crypto_get_attr_alg(tb, type, (mask & CRYPTO_ALG_TYPE_MASK)); |
327 | (algt->mask & CRYPTO_ALG_TYPE_MASK)); | ||
328 | if (IS_ERR(alg)) | 325 | if (IS_ERR(alg)) |
329 | return ERR_CAST(alg); | 326 | return ERR_CAST(alg); |
330 | 327 | ||
@@ -365,7 +362,7 @@ static struct crypto_instance *pcrypt_alloc(struct rtattr **tb) | |||
365 | 362 | ||
366 | switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) { | 363 | switch (algt->type & algt->mask & CRYPTO_ALG_TYPE_MASK) { |
367 | case CRYPTO_ALG_TYPE_AEAD: | 364 | case CRYPTO_ALG_TYPE_AEAD: |
368 | return pcrypt_alloc_aead(tb); | 365 | return pcrypt_alloc_aead(tb, algt->type, algt->mask); |
369 | } | 366 | } |
370 | 367 | ||
371 | return ERR_PTR(-EINVAL); | 368 | return ERR_PTR(-EINVAL); |