From: Wei Yongjun <[email protected]>

commit 9b40f79c08e81234d759f188b233980d7e81df6c upstream.
[Please apply to 4.4-stable.]

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 <[email protected]>
Signed-off-by: Herbert Xu <[email protected]>
Signed-off-by: Eric Biggers <[email protected]>
---
 crypto/gcm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/gcm.c b/crypto/gcm.c
index 0a12c09d7cb2b..f1c16589af8bb 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_skcipher_spawn_alg(&ctx->ctr);
 
        /* We only support 16-byte blocks. */
+       err = -EINVAL;
        if (ctr->cra_ablkcipher.ivsize != 16)
                goto out_put_ctr;
 
        /* Not a stream cipher? */
-       err = -EINVAL;
        if (ctr->cra_blocksize != 1)
                goto out_put_ctr;
 
-- 
2.21.0.1020.gf2820cf01a-goog

Reply via email to