Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2efd7c0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

crypto/ghash-generic.c

+6 −0
Original line number Diff line number Diff line
@@ -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);