Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: HCI: Use skb_pull_data to parse Inquiry Result event

Browse Source 
This uses skb_pull_data to check the Inquiry Result events received
have the minimum required length.

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Luiz Augusto von Dentz 2021-12-01 10:54:56 -08:00 committed by Marcel Holtmann
parent aadc3d2f42
commit 27d9eb4bca
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2028,6 +2028,11 @@ struct inquiry_info {
__le16 clock_offset;
} __packed;
struct hci_ev_inquiry_result {
__u8 num;
struct inquiry_info info[];
};
#define HCI_EV_CONN_COMPLETE 0x03
struct hci_ev_conn_complete {
__u8 status;

19
net/bluetooth/hci_event.c
View File

@ -3180,13 +3180,21 @@ unlock:
static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
{
struct hci_ev_inquiry_result *ev;
struct inquiry_data data;
struct inquiry_info *info = (void *) (skb->data + 1);
int num_rsp = *((__u8 *) skb->data);
int i;
BT_DBG("%s num_rsp %d", hdev->name, num_rsp);
ev = hci_ev_skb_pull(hdev, skb, HCI_EV_INQUIRY_RESULT, sizeof(*ev));
if (!ev)
return;
if (!num_rsp || skb->len < num_rsp * sizeof(*info) + 1)
if (!hci_ev_skb_pull(hdev, skb, HCI_EV_INQUIRY_RESULT,
flex_array_size(ev, info, ev->num)))
return;
BT_DBG("%s num %d", hdev->name, ev->num);
if (!ev->num)
return;
if (hci_dev_test_flag(hdev, HCI_PERIODIC_INQ))
@ -3194,7 +3202,8 @@ static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
hci_dev_lock(hdev);
for (; num_rsp; num_rsp--, info++) {
for (i = 0; i < ev->num; i++) {
struct inquiry_info *info = &ev->info[i];
u32 flags;
bacpy(&data.bdaddr, &info->bdaddr);