Bluetooth: Host: Check connection status before sending credits

donatieng · carlescufi · commit e4bcd6b92c67 · 2023-08-02T14:06:40.000+02:00
Upon receiving a L2CAP PDU, only send credits back if the L2CAP channel
hasn't been disconnected. The recv() callback called from
l2cap_chan_le_recv() can trigger a disconnect, which would cause an
assert failure when attempting to send credits back.

Signed-off-by: Donatien Garnier &lt;donatien.garnier@blecon.net&gt;
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
@@ -2653,7 +2653,12 @@ static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan,
 		return;
 	}
 
-	l2cap_chan_send_credits(chan, 1);
+	/* Only attempt to send credits if the channel wasn't disconnected
+	 * in the recv() callback above
+	 */
+	if (bt_l2cap_chan_get_state(&chan->chan) == BT_L2CAP_CONNECTED) {
+		l2cap_chan_send_credits(chan, 1);
+	}
 }
 
 static void l2cap_chan_recv_queue(struct bt_l2cap_le_chan *chan,

Original file line number	Diff line number	Diff line change
`@@ -2653,7 +2653,12 @@ static void l2cap_chan_le_recv(struct bt_l2cap_le_chan *chan,`
`2653`	`2653`	`return;`
`2654`	`2654`	`}`
`2655`	`2655`
`2656`		`- l2cap_chan_send_credits(chan, 1);`
	`2656`	`+ /* Only attempt to send credits if the channel wasn't disconnected`
	`2657`	`+ * in the recv() callback above`
	`2658`	`+ */`
	`2659`	`+ if (bt_l2cap_chan_get_state(&chan->chan) == BT_L2CAP_CONNECTED) {`
	`2660`	`+ l2cap_chan_send_credits(chan, 1);`
	`2661`	`+ }`
`2657`	`2662`	`}`
`2658`	`2663`
`2659`	`2664`	`static void l2cap_chan_recv_queue(struct bt_l2cap_le_chan *chan,`