michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Host: Add a validation for hci_le_read_max_data_len()

Browse source 
Check max_tx_octects and max_tx_time are in the valid range, according
to the BT Core spec 5.4 [Vol 4, Part E, 7.8.46]
Fix #70472

Signed-off-by: Sungwoo Kim <iam@sung-woo.kim>
This commit is contained in:
Sungwoo Kim 2024-03-20 17:56:49 -04:00 • committed by Fabio Baltieri
commit 2ca179c96e
2 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/zephyr/bluetooth/hci_types.h
View file

@ -1272,6 +1272,17 @@ struct bt_hci_cp_le_set_rpa_timeout {
uint16_t rpa_timeout;
} __packed;
/* All limits according to BT Core spec 5.4 [Vol 4, Part E, 7.8.46] */
#define BT_HCI_LE_MAX_TX_OCTETS_MIN 0x001B
#define BT_HCI_LE_MAX_TX_OCTETS_MAX 0x00FB
#define BT_HCI_LE_MAX_RX_OCTETS_MIN 0x001B
#define BT_HCI_LE_MAX_RX_OCTETS_MAX 0x00FB
#define BT_HCI_LE_MAX_TX_TIME_MIN 0x0148
#define BT_HCI_LE_MAX_TX_TIME_MAX 0x4290
#define BT_HCI_LE_MAX_RX_TIME_MIN 0x0148
#define BT_HCI_LE_MAX_RX_TIME_MAX 0x4290
#define BT_HCI_OP_LE_READ_MAX_DATA_LEN BT_OP(BT_OGF_LE, 0x002f) /* 0x202f */
struct bt_hci_rp_le_read_max_data_len {
uint8_t status;

20
subsys/bluetooth/host/hci_core.c
View file

@ -407,6 +407,13 @@ static int hci_le_read_max_data_len(uint16_t *tx_octets, uint16_t *tx_time)
*tx_time = sys_le16_to_cpu(rp->max_tx_time);
net_buf_unref(rsp);
if (!IN_RANGE(*tx_octets, BT_HCI_LE_MAX_TX_OCTETS_MIN, BT_HCI_LE_MAX_TX_OCTETS_MAX)) {
LOG_WRN("tx_octets exceeds the valid range %u", *tx_octets);
}
if (!IN_RANGE(*tx_time, BT_HCI_LE_MAX_TX_TIME_MIN, BT_HCI_LE_MAX_TX_TIME_MAX)) {
LOG_WRN("tx_time exceeds the valid range %u", *tx_time);
}
return 0;
}
@ -1682,6 +1689,19 @@ static void le_data_len_change(struct net_buf *buf)
uint16_t max_tx_time = sys_le16_to_cpu(evt->max_tx_time);
uint16_t max_rx_time = sys_le16_to_cpu(evt->max_rx_time);
if (!IN_RANGE(max_tx_octets, BT_HCI_LE_MAX_TX_OCTETS_MIN, BT_HCI_LE_MAX_TX_OCTETS_MAX)) {
LOG_WRN("max_tx_octets exceeds the valid range %u", max_tx_octets);
}
if (!IN_RANGE(max_rx_octets, BT_HCI_LE_MAX_RX_OCTETS_MIN, BT_HCI_LE_MAX_RX_OCTETS_MAX)) {
LOG_WRN("max_rx_octets exceeds the valid range %u", max_rx_octets);
}
if (!IN_RANGE(max_tx_time, BT_HCI_LE_MAX_TX_TIME_MIN, BT_HCI_LE_MAX_TX_TIME_MAX)) {
LOG_WRN("max_tx_time exceeds the valid range %u", max_tx_time);
}
if (!IN_RANGE(max_rx_time, BT_HCI_LE_MAX_RX_TIME_MIN, BT_HCI_LE_MAX_RX_TIME_MAX)) {
LOG_WRN("max_rx_time exceeds the valid range %u", max_rx_time);
}
LOG_DBG("max. tx: %u (%uus), max. rx: %u (%uus)", max_tx_octets, max_tx_time, max_rx_octets,
max_rx_time);