aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_event.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2013-10-17 20:24:13 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2013-10-18 03:21:28 -0400
commitb9ee0a783a928631bff1f0ea355bb9dc5deeaaf8 (patch)
tree2e11b6ad340c51745dc806750361ec73c63bf2d9 /net/bluetooth/hci_event.c
parent041000b94276da0debf911494f0825571b2f26fb (diff)
Bluetooth: Add address type to device blacklist table
The device blacklist is not taking care of the address type. Actually store the address type in the list entries and also use them when looking up addresses in the table. This is actually a serious bug. When adding a LE public address to the blacklist, then it would be blocking a device on BR/EDR. And this is not the expected behavior. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 6c3b193951ad..e43de9876aa0 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1692,7 +1692,7 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
1692 &flags); 1692 &flags);
1693 1693
1694 if ((mask & HCI_LM_ACCEPT) && 1694 if ((mask & HCI_LM_ACCEPT) &&
1695 !hci_blacklist_lookup(hdev, &ev->bdaddr)) { 1695 !hci_blacklist_lookup(hdev, &ev->bdaddr, BDADDR_BREDR)) {
1696 /* Connection accepted */ 1696 /* Connection accepted */
1697 struct inquiry_entry *ie; 1697 struct inquiry_entry *ie;
1698 struct hci_conn *conn; 1698 struct hci_conn *conn;