Commit 5c5b93e4 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann
Browse files

Bluetooth: Fix address in unmergeable device found events 



When sending out a device found event caused by an advertising report in
the situation where we couldn't store the report as a pending one, the
code was incorrectly trying to use the address and address type from the
pending data. Since the pending data is cleared in the previous line
this causes a potentially incorrect address type and an address of
BDADDR_ANY. This patch fixes the call to use the address information
correctly from the received advertising report.

Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 0d367408

net/bluetooth/hci_event.c

+2 −3
Original line number Diff line number Diff line
@@ -4081,9 +4081,8 @@ static void process_adv_report(struct hci_dev *hdev, u8 type, bdaddr_t *bdaddr, 
		 * the pending report and send out a device found event.

		 */

		clear_pending_adv_report(hdev);

		mgmt_device_found(hdev, &d->last_adv_addr, LE_LINK,

				  d->last_adv_addr_type, NULL, rssi, 0, 1,

				  data, len, NULL, 0);

		mgmt_device_found(hdev, bdaddr, LE_LINK, bdaddr_type, NULL,

				  rssi, 0, 1, data, len, NULL, 0);

		return;

	}