michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Controller: Add Ext Adv Parameter Validations

Browse source 
Add Extended Advertising interval parameter validation.

Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
This commit is contained in:
Vinayak Kariappa Chettimada 2022-04-28 15:53:44 +05:30 • committed by Carles Cufí
commit d04f5917bf
1 changed files with 39 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

43
subsys/bluetooth/controller/hci/hci.c
View file

@ -3273,6 +3273,24 @@ static void le_set_ext_adv_param(struct net_buf *buf, struct net_buf **evt)
return; return;
} }
min_interval = sys_get_le24(cmd->prim_min_interval);
if (IS_ENABLED(CONFIG_BT_CTLR_PARAM_CHECK)) {
const uint32_t max_interval =
sys_get_le24(cmd->prim_max_interval);
/* Compare advertising interval maximum with implementation
* supported advertising interval maximum value defined in the
* Kconfig CONFIG_BT_CTLR_ADV_INTERVAL_MAX.
*/
if ((min_interval > max_interval) ||
(min_interval < BT_HCI_LE_PRIM_ADV_INTERVAL_MIN) ||
(max_interval > CONFIG_BT_CTLR_ADV_INTERVAL_MAX)) {
*evt = cmd_complete_status(BT_HCI_ERR_UNSUPP_FEATURE_PARAM_VAL);
return;
}
}
status = ll_adv_set_by_hci_handle_get_or_new(cmd->handle, &handle); status = ll_adv_set_by_hci_handle_get_or_new(cmd->handle, &handle);
if (status) { if (status) {
*evt = cmd_complete_status(status); *evt = cmd_complete_status(status);
@ -3280,7 +3298,6 @@ static void le_set_ext_adv_param(struct net_buf *buf, struct net_buf **evt)
} }
evt_prop = sys_le16_to_cpu(cmd->props); evt_prop = sys_le16_to_cpu(cmd->props);
min_interval = sys_get_le24(cmd->prim_min_interval);
tx_pwr = cmd->tx_power; tx_pwr = cmd->tx_power;
phy_p = BIT(cmd->prim_adv_phy - 1); phy_p = BIT(cmd->prim_adv_phy - 1);
phy_s = BIT(cmd->sec_adv_phy - 1); phy_s = BIT(cmd->sec_adv_phy - 1);
@ -3464,7 +3481,7 @@ static void le_clear_adv_sets(struct net_buf *buf, struct net_buf **evt)
static void le_set_per_adv_param(struct net_buf *buf, struct net_buf **evt) static void le_set_per_adv_param(struct net_buf *buf, struct net_buf **evt)
{ {
struct bt_hci_cp_le_set_per_adv_param *cmd = (void *)buf->data; struct bt_hci_cp_le_set_per_adv_param *cmd = (void *)buf->data;
uint16_t interval; uint16_t max_interval;
uint16_t flags; uint16_t flags;
uint8_t status; uint8_t status;
uint8_t handle; uint8_t handle;
@ -3473,16 +3490,34 @@ static void le_set_per_adv_param(struct net_buf *buf, struct net_buf **evt)
return; return;
} }
max_interval = sys_le16_to_cpu(cmd->max_interval);
if (IS_ENABLED(CONFIG_BT_CTLR_PARAM_CHECK)) {
const uint32_t min_interval =
sys_le16_to_cpu(cmd->min_interval);
/* Compare periodic advertising interval maximum with
* implementation supported periodic advertising interval
* maximum value defined in the Kconfig
* CONFIG_BT_CTLR_ADV_PERIODIC_INTERVAL_MAX.
*/
if ((min_interval > max_interval) ||
(min_interval < BT_HCI_LE_PER_ADV_INTERVAL_MIN) ||
(max_interval > CONFIG_BT_CTLR_ADV_PERIODIC_INTERVAL_MAX)) {
*evt = cmd_complete_status(BT_HCI_ERR_UNSUPP_FEATURE_PARAM_VAL);
return;
}
}
status = ll_adv_set_by_hci_handle_get(cmd->handle, &handle); status = ll_adv_set_by_hci_handle_get(cmd->handle, &handle);
if (status) { if (status) {
*evt = cmd_complete_status(status); *evt = cmd_complete_status(status);
return; return;
} }
interval = sys_le16_to_cpu(cmd->max_interval);
flags = sys_le16_to_cpu(cmd->props); flags = sys_le16_to_cpu(cmd->props);
status = ll_adv_sync_param_set(handle, interval, flags); status = ll_adv_sync_param_set(handle, max_interval, flags);
*evt = cmd_complete_status(status); *evt = cmd_complete_status(status);
} }