Commit e733fb62 authored Jan 29, 2011 by Bao Liang Committed by Gustavo F. Padovan Feb 02, 2011

Bluetooth: Set conn state to BT_DISCONN to avoid multiple responses



This patch fixes a minor issue that two connection responses will be sent
for one L2CAP connection request. If the L2CAP connection request is first
blocked due to security reason and responded with reason "security block",
the state of the connection remains BT_CONNECT2. If a pairing procedure
completes successfully before the ACL connection is down, local host will
send another connection complete response. See the following packets
captured by hcidump.

2010-12-07 22:21:24.928096 < ACL data: handle 12 flags 0x00 dlen 16
    0000: 0c 00 01 00 03 19 08 00  41 00 53 00 03 00 00 00  ........A.S.....
... ...

2010-12-07 22:21:35.791747 > HCI Event: Auth Complete (0x06) plen 3
    status 0x00 handle 12
... ...

2010-12-07 22:21:35.872372 > ACL data: handle 12 flags 0x02 dlen 16
    L2CAP(s): Connect rsp: dcid 0x0054 scid 0x0040 result 0 status 0
      Connection successful

Signed-off-by: Liang Bao <tim.bao@gmail.com>
Acked-by: Ville Tervo <ville.tervo@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

parent 509e7861

net/bluetooth/l2cap.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -859,6 +859,7 @@ static void __l2cap_sock_close(struct sock *sk, int reason)
		result = L2CAP_CR_SEC_BLOCK;
		else
		result = L2CAP_CR_BAD_PSM;
		sk->sk_state = BT_DISCONN;

		rsp.scid = cpu_to_le16(l2cap_pi(sk)->dcid);
		rsp.dcid = cpu_to_le16(l2cap_pi(sk)->scid);

Admin message