Commit fee64503 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Marcel Holtmann
Browse files

Bluetooth: hci_event: Use skb_pull_data when processing inquiry results 



This makes each result entry to be checked using skb_pull_data instead
of acessing them by index.

Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 744451c1

net/bluetooth/hci_event.c

+18 −2
Original line number Diff line number Diff line
@@ -4531,7 +4531,15 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata, 
		for (i = 0; i < ev->res2->num; i++) {

			u32 flags;



			info = &ev->res2->info[i];

			info = hci_ev_skb_pull(hdev, skb,

					       HCI_EV_INQUIRY_RESULT_WITH_RSSI,

					       sizeof(*info));

			if (!info) {

				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",

					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);

				return;

			}



			bacpy(&data.bdaddr, &info->bdaddr);

			data.pscan_rep_mode	= info->pscan_rep_mode;

			data.pscan_period_mode	= info->pscan_period_mode;
@@ -4553,7 +4561,15 @@ static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, void *edata, 
		for (i = 0; i < ev->res1->num; i++) {

			u32 flags;



			info = &ev->res1->info[i];

			info = hci_ev_skb_pull(hdev, skb,

					       HCI_EV_INQUIRY_RESULT_WITH_RSSI,

					       sizeof(*info));

			if (!info) {

				bt_dev_err(hdev, "Malformed HCI Event: 0x%2.2x",

					   HCI_EV_INQUIRY_RESULT_WITH_RSSI);

				return;

			}



			bacpy(&data.bdaddr, &info->bdaddr);

			data.pscan_rep_mode	= info->pscan_rep_mode;

			data.pscan_period_mode	= info->pscan_period_mode;