aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2014-07-06 04:03:36 -0400
committerMarcel Holtmann <marcel@holtmann.org>2014-07-06 04:13:56 -0400
commit9e1d7e15340b14bfb2ac86d77ca72fcebfe67d66 (patch)
treeff054f3487d2ad4986fed39fa1fa147d97851032 /net
parente30d3f5fef378cd14ba8c331a5c7a2f9239c2770 (diff)
Bluetooth: Restrict blocked device check in l2cap_recv_frame to LE
BR/EDR has the connection request and connection request rejection, but LE doesn't have anything similar. We still request LE connections to blocked devices to be disconnected but it's possible that ACL data slips through before that. The check in l2cap_recv_frame really only needs to be for LE and not BR/EDR because of this. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index dbef22d644e2..f1f544a12c3c 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6914,7 +6914,11 @@ static void l2cap_recv_frame(struct l2cap_conn *conn, struct sk_buff *skb)
6914 return; 6914 return;
6915 } 6915 }
6916 6916
6917 if (hci_blacklist_lookup(hcon->hdev, &hcon->dst, 6917 /* Since we can't actively block incoming LE connections we must
6918 * at least ensure that we ignore incoming data from them.
6919 */
6920 if (hcon->type == LE_LINK &&
6921 hci_blacklist_lookup(hcon->hdev, &hcon->dst,
6918 bdaddr_type(hcon, hcon->dst_type))) { 6922 bdaddr_type(hcon, hcon->dst_type))) {
6919 kfree_skb(skb); 6923 kfree_skb(skb);
6920 return; 6924 return;