Skip to content

Commit e454c84

Browse files
author
Gustavo F. Padovan
committed
Bluetooth: Fix deadlock in the ERTM logic
The Enhanced Retransmission Mode(ERTM) is a realiable mode of operation of the Bluetooth L2CAP layer. Think on it like a simplified version of TCP. The problem we were facing here was a deadlock. ERTM uses a backlog queue to queue incomimg packets while the user is helding the lock. At some moment the sk_sndbuf can be exceeded and we can't alloc new skbs then the code sleep with the lock to wait for memory, that stalls the ERTM connection once we can't read the acknowledgements packets in the backlog queue to free memory and make the allocation of outcoming skb successful. This patch actually affect all users of bt_skb_send_alloc(), i.e., all L2CAP modes and SCO. We are safe against socket states changes or channels deletion while the we are sleeping wait memory. Checking for the sk->sk_err and sk->sk_shutdown make the code safe, since any action that can leave the socket or the channel in a not usable state set one of the struct members at least. Then we can check both of them when getting the lock again and return with the proper error if something unexpected happens. Signed-off-by: Gustavo F. Padovan <[email protected]> Signed-off-by: Ulisses Furquim <[email protected]>
1 parent b0239c8 commit e454c84

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

include/net/bluetooth/bluetooth.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,30 @@ static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk, unsigned long l
161161
{
162162
struct sk_buff *skb;
163163

164+
release_sock(sk);
164165
if ((skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err))) {
165166
skb_reserve(skb, BT_SKB_RESERVE);
166167
bt_cb(skb)->incoming = 0;
167168
}
169+
lock_sock(sk);
170+
171+
if (!skb && *err)
172+
return NULL;
173+
174+
*err = sock_error(sk);
175+
if (*err)
176+
goto out;
177+
178+
if (sk->sk_shutdown) {
179+
*err = -ECONNRESET;
180+
goto out;
181+
}
168182

169183
return skb;
184+
185+
out:
186+
kfree_skb(skb);
187+
return NULL;
170188
}
171189

172190
int bt_err(__u16 code);

0 commit comments

Comments
 (0)