Commit 9f06a8d6 authored by Behan Webster's avatar Behan Webster Committed by Marcel Holtmann

Bluetooth: LLVMLinux: Remove VLAIS from bluetooth/amp.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 an char array.

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

struct shash_desc contains a flexible array member member ctx declared with
CRYPTO_MINALIGN_ATTR, so sizeof(struct shash_desc) aligns the beginning
of the array declared after struct shash_desc with long long.

No trailing padding is required because it is not a struct type that can
be used in an array.

The CRYPTO_MINALIGN_ATTR is required so that desc is aligned with long long
as would be the case for a struct containing a member with
CRYPTO_MINALIGN_ATTR.
Signed-off-by: default avatarBehan Webster <behanw@converseincode.com>
Signed-off-by: default avatarMark Charlebois <charlebm@gmail.com>
Signed-off-by: default avatarJan-Simon Möller <dl9pf@gmx.de>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent b28b4943
...@@ -149,15 +149,14 @@ static int hmac_sha256(u8 *key, u8 ksize, char *plaintext, u8 psize, u8 *output) ...@@ -149,15 +149,14 @@ static int hmac_sha256(u8 *key, u8 ksize, char *plaintext, u8 psize, u8 *output)
if (ret) { if (ret) {
BT_DBG("crypto_ahash_setkey failed: err %d", ret); BT_DBG("crypto_ahash_setkey failed: err %d", ret);
} else { } else {
struct { char desc[sizeof(struct shash_desc) +
struct shash_desc shash; crypto_shash_descsize(tfm)] CRYPTO_MINALIGN_ATTR;
char ctx[crypto_shash_descsize(tfm)]; struct shash_desc *shash = (struct shash_desc *)desc;
} desc;
desc.shash.tfm = tfm; shash->tfm = tfm;
desc.shash.flags = CRYPTO_TFM_REQ_MAY_SLEEP; shash->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
ret = crypto_shash_digest(&desc.shash, plaintext, psize, ret = crypto_shash_digest(shash, plaintext, psize,
output); output);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment