leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bluetooth: LLVMLinux: Remove VLAIS from bluetooth/amp.c

Browse Source 
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: Behan Webster <behanw@converseincode.com>
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
Signed-off-by: Jan-Simon Möller <dl9pf@gmx.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Behan Webster 2014-09-05 16:03:34 -07:00 committed by Marcel Holtmann
parent b28b494366
commit 9f06a8d623
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net/bluetooth/amp.c
View File

@ -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);
} }