diff options
| author |  Gustavo A. R. Silva <gustavoars@kernel.org>
| 2024-04-26 10:45:17 -0600 |
|---|---|---|
| committer |  Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
| 2024-05-14 10:51:06 -0400 |
| commit | c90748b898cf9a0654aeadac1ba2254e3ab8e9fa (patch) | |
| tree | 97dda02a88f52b69c64b427fbd580ae10963e4c9 /include/net | |
| parent | Bluetooth: hci_conn, hci_sync: Use __counted_by() to avoid -Wfamnae warnings (diff) | |
| download | linux-c90748b898cf9a0654aeadac1ba2254e3ab8e9fa.tar.gz linux-c90748b898cf9a0654aeadac1ba2254e3ab8e9fa.tar.bz2 linux-c90748b898cf9a0654aeadac1ba2254e3ab8e9fa.zip | |
Bluetooth: hci_conn: Use __counted_by() to avoid -Wfamnae warning
Prepare for the coming implementation by GCC and Clang of the
__counted_by attribute. Flexible array members annotated with
__counted_by can have their accesses bounds-checked at run-time
via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE
(for strcpy/memcpy-family functions).
Also, -Wflex-array-member-not-at-end is coming in GCC-14, and we are
getting ready to enable it globally.
So, use the `DEFINE_FLEX()` helper for an on-stack definition of
a flexible structure where the size of the flexible-array member
is known at compile-time, and refactor the rest of the code,
accordingly.
With these changes, fix the following warning:
net/bluetooth/hci_conn.c:2116:50: warning: structure containing a flexible
array member is not at the end of another structure
[-Wflex-array-member-not-at-end]
Link: https://github.com/KSPP/linux/issues/202
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 0b0ac7f06570..c4c6b8810701 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -2216,7 +2216,7 @@ struct hci_cp_le_big_create_sync { __u8 mse; __le16 timeout; __u8 num_bis; - __u8 bis[]; + __u8 bis[] __counted_by(num_bis); } __packed; #define HCI_OP_LE_BIG_TERM_SYNC 0x206c |