summaryrefslogtreecommitdiff
authorWei Yongjun <weiyongjun1@huawei.com>2016-10-17 15:10:06 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-21 16:49:00 (GMT)
commit2f95ee0b226814cf7ed0fc1b9895f88f617e2097 (patch)
treeb918d30e71269c38002574aa137f065e8788ce2b
parenta2a2a146ec882912dae3e0e3864c60105220532d (diff)
downloadcommon-2f95ee0b226814cf7ed0fc1b9895f88f617e2097.zip
common-2f95ee0b226814cf7ed0fc1b9895f88f617e2097.tar.gz
common-2f95ee0b226814cf7ed0fc1b9895f88f617e2097.tar.bz2
crypto: gcm - Fix error return code in crypto_gcm_create_common()
commit 9b40f79c08e81234d759f188b233980d7e81df6c upstream. Fix to return error code -EINVAL from the invalid alg ivsize error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat
-rw-r--r--crypto/gcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/gcm.c b/crypto/gcm.c
index dd33fbd..122f5e9 100644
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -670,11 +670,11 @@ static int crypto_gcm_create_common(struct crypto_template *tmpl,
ctr = crypto_spawn_skcipher_alg(&ctx->ctr);
/* We only support 16-byte blocks. */
+ err = -EINVAL;
if (crypto_skcipher_alg_ivsize(ctr) != 16)
goto out_put_ctr;
/* Not a stream cipher? */
- err = -EINVAL;
if (ctr->base.cra_blocksize != 1)
goto out_put_ctr;