MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-12 12:25:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ANDROID: abi fixups for HCI_AMP removal changes

Browse Source 
In commit 5af2e235b0 ("Bluetooth: HCI: Remove HCI_AMP support"), the
HCI_AMP support was removed from the kernel in order to address
CVE-2024-38620, but that broke a bunch of bluetooth api checks as
structures were made smaller.  Put those "empty" structures back in
order to preserve the ABI, but yet the logic that drove the removal is
still in place (i.e. the feature is gone.)

Bug: 161946584
Fixes: 5af2e235b0 ("Bluetooth: HCI: Remove HCI_AMP support")
Change-Id: If611dc20380848269a230bf8d5d2e1ee5a165d42
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2024-06-20 15:45:47 +00:00
parent 01acf6e91d
commit dc65436adf
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/hci.h
View File

@ -34,6 +34,8 @@
#define HCI_LINK_KEY_SIZE 16
#define HCI_MAX_AMP_ASSOC_SIZE 672
#define HCI_MAX_CPB_DATA_SIZE 252
/* HCI dev events */

30
include/net/bluetooth/hci_core.h
View File

@ -127,6 +127,7 @@ enum suspended_state {
struct hci_conn_hash {
struct list_head list;
unsigned int acl_num;
unsigned int amp_num;
unsigned int sco_num;
unsigned int iso_num;
unsigned int le_num;
@ -341,6 +342,14 @@ struct adv_monitor {
/* Default authenticated payload timeout 30s */
#define DEFAULT_AUTH_PAYLOAD_TIMEOUT 0x0bb8
struct amp_assoc {
__u16 len;
__u16 offset;
__u16 rem_len;
__u16 len_so_far;
__u8 data[HCI_MAX_AMP_ASSOC_SIZE];
};
#define HCI_MAX_PAGES 3
struct hci_dev {
@ -353,6 +362,7 @@ struct hci_dev {
unsigned long flags;
__u16 id;
__u8 bus;
__u8 dev_type;
bdaddr_t bdaddr;
bdaddr_t setup_addr;
bdaddr_t public_addr;
@ -458,6 +468,21 @@ struct hci_dev {
__u16 sniff_min_interval;
__u16 sniff_max_interval;
__u8 amp_status;
__u32 amp_total_bw;
__u32 amp_max_bw;
__u32 amp_min_latency;
__u32 amp_max_pdu;
__u8 amp_type;
__u16 amp_pal_cap;
__u16 amp_assoc_size;
__u32 amp_max_flush_to;
__u32 amp_be_flush_to;
struct amp_assoc loc_assoc;
__u8 flow_ctl_mode;
unsigned int auto_accept_delay;
unsigned long quirks;
@ -477,6 +502,11 @@ struct hci_dev {
unsigned int le_pkts;
unsigned int iso_pkts;
__u16 block_len;
__u16 block_mtu;
__u16 num_blocks;
__u16 block_cnt;
unsigned long acl_last_tx;
unsigned long sco_last_tx;
unsigned long le_last_tx;