History

Bluetooth: HCI: Use skb_pull_data to parse Inquiry Result with RSSI event

This uses skb_pull_data to check the Inquiry Result with RSSI events received have the minimum required length.

Luiz Augusto von Dentz committed 4 years ago

Commit 8d08d321 parent 27d9eb42 files · +33 −19Browse files

Unified · Split

2 files
  1. include/net/bluetooth/hci.h +10 −2
  2. net/bluetooth/hci_event.c +23 −17
include/net/bluetooth/hci.h+10−2
@@ -2194,7 +2194,7 @@ struct hci_ev_pscan_rep_mode { · 2193 unmodified lines
21942194 } __packed;
21952195
21962196 #define HCI_EV_INQUIRY_RESULT_WITH_RSSI 0x22
2197−struct inquiry_info_with_rssi {
2197+struct inquiry_info_rssi {
21982198 bdaddr_t bdaddr;
21992199 __u8 pscan_rep_mode;
22002200 __u8 pscan_period_mode;
@@ -2202,7 +2202,7 @@ struct inquiry_info_with_rssi { · 1 unmodified line
22022202 __le16 clock_offset;
22032203 __s8 rssi;
22042204 } __packed;
2205−struct inquiry_info_with_rssi_and_pscan_mode {
2205+struct inquiry_info_rssi_pscan {
22062206 bdaddr_t bdaddr;
22072207 __u8 pscan_rep_mode;
22082208 __u8 pscan_period_mode;
@@ -2211,6 +2211,14 @@ struct inquiry_info_with_rssi_and_pscan_mode { · 2 unmodified lines
22112211 __le16 clock_offset;
22122212 __s8 rssi;
22132213 } __packed;
2214+struct hci_ev_inquiry_result_rssi {
2215+ __u8 num;
2216+ struct inquiry_info_rssi info[];
2217+} __packed;
2218+struct hci_ev_inquiry_result_rssi_pscan {
2219+ __u8 num;
2220+ struct inquiry_info_rssi_pscan info[];
2221+} __packed;
22142222
22152223 #define HCI_EV_REMOTE_EXT_FEATURES 0x23
22162224 struct hci_ev_remote_ext_features {
net/bluetooth/hci_event.c+23−17
@@ -4921,12 +4921,21 @@ static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb) · 4920 unmodified lines
49214921 static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,
49224922 struct sk_buff *skb)
49234923 {
4924+ union {
4925+ struct hci_ev_inquiry_result_rssi *res1;
4926+ struct hci_ev_inquiry_result_rssi_pscan *res2;
4927+ } *ev;
49244928 struct inquiry_data data;
4925− int num_rsp = *((__u8 *) skb->data);
4929+ int i;
49264930
4927− BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
4931+ ev = hci_ev_skb_pull(hdev, skb, HCI_EV_INQUIRY_RESULT_WITH_RSSI,
4932+ sizeof(*ev));
4933+ if (!ev)
4934+ return;
4935+
4936+ BT_DBG("%s num_rsp %d", hdev->name, ev->res1->num);
49284937
4929− if (!num_rsp)
4938+ if (!ev->res1->num)
49304939 return;
49314940
49324941 if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))
@@ -4934,16 +4943,13 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, · 1 unmodified line
49344943
49354944 hci_dev_lock(hdev);
49364945
4937− if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) {
4938− struct inquiry_info_with_rssi_and_pscan_mode *info;
4939− info = (void *) (skb->data + 1);
4946+ if (skb->len == flex_array_size(ev, res2->info, ev->res2->num)) {
4947+ struct inquiry_info_rssi_pscan *info;
49404948
4941− if (skb->len < num_rsp * sizeof(*info) + 1)
4942− goto unlock;
4943−
4944− for (; num_rsp; num_rsp--, info++) {
4949+ for (i = 0; i < ev->res2->num; i++) {
49454950 u32 flags;
49464951
4952+ info = &ev->res2->info[i];
49474953 bacpy(&data.bdaddr, &info->bdaddr);
49484954 data.pscan_rep_mode = info->pscan_rep_mode;
49494955 data.pscan_period_mode = info->pscan_period_mode;
@@ -4959,15 +4965,13 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, · 9 unmodified lines
49594965 info->dev_class, info->rssi,
49604966 flags, NULL, 0, NULL, 0);
49614967 }
4962− } else {
4963− struct inquiry_info_with_rssi *info = (void *) (skb->data + 1);
4968+ } else if (skb->len == flex_array_size(ev, res1->info, ev->res1->num)) {
4969+ struct inquiry_info_rssi *info;
49644970
4965− if (skb->len < num_rsp * sizeof(*info) + 1)
4966− goto unlock;
4967−
4968− for (; num_rsp; num_rsp--, info++) {
4971+ for (i = 0; i < ev->res1->num; i++) {
49694972 u32 flags;
49704973
4974+ info = &ev->res1->info[i];
49714975 bacpy(&data.bdaddr, &info->bdaddr);
49724976 data.pscan_rep_mode = info->pscan_rep_mode;
49734977 data.pscan_period_mode = info->pscan_period_mode;
@@ -4983,9 +4987,11 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, · 9 unmodified lines
49834987 info->dev_class, info->rssi,
49844988 flags, NULL, 0, NULL, 0);
49854989 }
4990+ } else {
4991+ bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",
4992+ HCI_EV_INQUIRY_RESULT_WITH_RSSI);
49864993 }
49874994
4988−unlock:
49894995 hci_dev_unlock(hdev);
49904996 }
49914997

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t