Commit ea0e0de6 authored Jul 02, 2012 by Jan-Simon Möller Committed by Behan Webster Oct 14, 2014

crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c



Replaced the use of a Variable Length Array In Struct (VLAIS) with a C99
compliant equivalent. This patch allocates the appropriate amount of memory
using a char array using the SHASH_DESC_ON_STACK macro.

The new code can be compiled with both gcc and clang.

Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Reviewed-by: Mark Charlebois <charlebm@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Cc: pageexec@freemail.hu
Cc: "David S. Miller" <davem@davemloft.net>

parent ffb32e97

lib/libcrc32c.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -41,20 +41,18 @@ static struct crypto_shash *tfm;

		u32 crc32c(u32 crc, const void *address, unsigned int length)
		{
		struct {
		struct shash_desc shash;
		char ctx[crypto_shash_descsize(tfm)];
		} desc;
		SHASH_DESC_ON_STACK(shash, tfm);
		u32 ctx = (u32 )shash_desc_ctx(shash);
		int err;

		desc.shash.tfm = tfm;
		desc.shash.flags = 0;
		(u32 )desc.ctx = crc;
		shash->tfm = tfm;
		shash->flags = 0;
		*ctx = crc;

		err = crypto_shash_update(&desc.shash, address, length);
		err = crypto_shash_update(shash, address, length);
		BUG_ON(err);

		return (u32 )desc.ctx;
		return *ctx;
		}

		EXPORT_SYMBOL(crc32c);