diff options
| author | Jan-Simon Möller <dl9pf@gmx.de> | 2012-07-02 12:54:28 +0200 |
|---|---|---|
| committer | Behan Webster <behanw@converseincode.com> | 2014-03-31 00:07:18 -0700 |
| commit | b271f5e06b5ea8c13dabd88687c566432fb76181 (patch) | |
| tree | 1b2db03f996a8731a3d05f5fb9577fa4386d1fbb /lib | |
| parent | 81a66af61d8f2f841b2ba4905481ce42c8ad1991 (diff) | |
crypto: LLVMLinux: Remove VLAIS usage from libcrc32c.c
The use of variable length arrays in structs (VLAIS) in the Linux Kernel code
precludes the use of compilers which don't implement VLAIS (for instance the
Clang compiler). This patch instead allocates the appropriate amount of memory
using an char array.
Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Cc: pageexec@freemail.hu
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrc32c.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c index 244f5480c89..c155b3fc1be 100644 --- a/lib/libcrc32c.c +++ b/lib/libcrc32c.c @@ -41,20 +41,20 @@ 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; + char desc[sizeof(struct shash_desc) + crypto_shash_descsize(tfm) + + CRYPTO_MINALIGN] CRYPTO_MINALIGN_ATTR; + struct shash_desc *shash = (struct shash_desc *)desc; + 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); |