TononixOS/ubports_kernel_google_msm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Fix ATT Indicate/Confirm handling

Browse Source 
If due to timing issues out of our control, an outbound ATT Indicate
is delayed to the point that user space code does not receive
confirmation within it time-out period, both Client and Server
sockets must be torn down. We also must always respond to incoming
ATT Indicate pkt with a Confirmation, as the Error Response is an
illegal response for Indicate.

CRs-Fixed: 363355
Change-Id: I4003a59e1a731a08818f18d5b79db537e2aa2619
Signed-off-by: Brian Gix <bgix@codeaurora.org>
This commit is contained in:
Brian Gix
2012-06-05 13:35:39 -07:00
committed by Stephen Boyd
parent 1a9efd2c10
commit cdcf81ac5b
3 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/bluetooth/l2cap_sock.c
View File

@@ -1174,7 +1174,7 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)
static int l2cap_sock_release(struct socket *sock)
{
struct sock *sk = sock->sk;
struct sock *srv_sk = NULL;
struct sock *sk2 = NULL;
int err;
BT_DBG("sock %p, sk %p", sock, sk);
@@ -1182,15 +1182,16 @@ static int l2cap_sock_release(struct socket *sock)
if (!sk)
return 0;
/* If this is an ATT Client socket, find the matching Server */
if (l2cap_pi(sk)->scid == L2CAP_CID_LE_DATA && !l2cap_pi(sk)->incoming)
srv_sk = l2cap_find_sock_by_fixed_cid_and_dir(L2CAP_CID_LE_DATA,
&bt_sk(sk)->src, &bt_sk(sk)->dst, 1);
/* If this is an ATT socket, find it's matching server/client */
if (l2cap_pi(sk)->scid == L2CAP_CID_LE_DATA)
sk2 = l2cap_find_sock_by_fixed_cid_and_dir(L2CAP_CID_LE_DATA,
&bt_sk(sk)->src, &bt_sk(sk)->dst,
l2cap_pi(sk)->incoming ? 0 : 1);
/* If server socket found, request tear down */
BT_DBG("client:%p server:%p", sk, srv_sk);
if (srv_sk)
l2cap_sock_set_timer(srv_sk, 1);
/* If matching socket found, request tear down */
BT_DBG("sock:%p companion:%p", sk, sk2);
if (sk2)
l2cap_sock_set_timer(sk2, 1);
err = l2cap_sock_shutdown(sock, 2);