Merge git://github.com/herbertx/crypto

* git://github.com/herbertx/crypto:
  crypto: ghash - Avoid null pointer dereference if no key is set

1 files changed, 6 insertions, 0 deletions

diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c
index be4425616931..7835b8fc94db 100644
--- a/crypto/ghash-generic.c
+++ b/crypto/ghash-generic.c
@@ -67,6 +67,9 @@ static int ghash_update(struct shash_desc *desc,
         struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm);
         u8 *dst = dctx->buffer;
 
+        if (!ctx->gf128)
+                return -ENOKEY;
+
         if (dctx->bytes) {
                 int n = min(srclen, dctx->bytes);
                 u8 *pos = dst + (GHASH_BLOCK_SIZE - dctx->bytes);
@@ -119,6 +122,9 @@ static int ghash_final(struct shash_desc *desc, u8 *dst)
         struct ghash_ctx *ctx = crypto_shash_ctx(desc->tfm);
         u8 *buf = dctx->buffer;
 
+        if (!ctx->gf128)
+                return -ENOKEY;
+
         ghash_flush(ctx, dctx);
         memcpy(dst, buf, GHASH_BLOCK_SIZE);