Commit 141d5706 authored Apr 29, 2013 by Johan Hedberg Committed by Gustavo Padovan Jun 23, 2013

Bluetooth: Fix EBUSY condition test in l2cap_chan_connect



The current test in l2cap_chan_connect is intended to protect against
multiple conflicting connect attempts. However, it assumes that there
will ever only be a single CID that is connected to, which is not true.
We do need to check for conflicts with connect attempts to the same
destination CID but this check is not in anyway specific to LE but can
be applied to BR/EDR as well.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

parent f224ca5f

net/bluetooth/l2cap_core.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -1811,15 +1811,9 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
		goto done;
		}

		if (hcon->type == LE_LINK) {
		err = 0;

		if (!list_empty(&conn->chan_l)) {
		err = -EBUSY;
		if (cid && __l2cap_get_chan_by_dcid(conn, cid)) {
		hci_conn_drop(hcon);
		}

		if (err)
		err = -EBUSY;
		goto done;
		}

Admin message