diff options
| author | Johan Hedberg | 2014-07-06 10:03:36 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2014-07-06 10:13:56 +0200 |
| commit | 9e1d7e15340b14bfb2ac86d77ca72fcebfe67d66 (patch) | |
| tree | ff054f3487d2ad4986fed39fa1fa147d97851032 /net | |
| parent | Bluetooth: Store Bluetooth address from controller setup (diff) | |
| download | kernel-qcow2-linux-9e1d7e15340b14bfb2ac86d77ca72fcebfe67d66.tar.gz kernel-qcow2-linux-9e1d7e15340b14bfb2ac86d77ca72fcebfe67d66.tar.xz kernel-qcow2-linux-9e1d7e15340b14bfb2ac86d77ca72fcebfe67d66.zip | |
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.c | 6 |
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) return; } - if (hci_blacklist_lookup(hcon->hdev, &hcon->dst, + /* Since we can't actively block incoming LE connections we must + * at least ensure that we ignore incoming data from them. + */ + if (hcon->type == LE_LINK && + hci_blacklist_lookup(hcon->hdev, &hcon->dst, bdaddr_type(hcon, hcon->dst_type))) { kfree_skb(skb); return; |