Bluetooth: host: Fix L2CAP reconfigure response with invalid CID

sjanc · cfriedt · commit 2ad1ef651b8b · 2022-08-02T12:36:44.000-04:00
When an L2CAP_CREDIT_BASED_RECONFIGURE_REQ packet is received with invalid parameters, the recipient shall send an L2CAP_CREDIT_BASED_RECONFIGURE_RSP PDU with a non-zero Result field and not change any MTU and MPS values. This fix incorrectly reconfiguring valid channels while responding with 0x003 (Reconfiguration failed - one or more Destination CIDs invalid) result code. Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl> (cherry picked from commit 253070b)
diff --git a/subsys/bluetooth/host/l2cap.c b/subsys/bluetooth/host/l2cap.c
@@ -1295,7 +1295,7 @@ static void le_ecred_reconf_req(struct bt_l2cap *l2cap, uint8_t ident,
 		chan = bt_l2cap_le_lookup_tx_cid(conn, scid);
 		if (!chan) {
 			result = BT_L2CAP_RECONF_INVALID_CID;
-			continue;
+			goto response;
 		}
 
 		if (BT_L2CAP_LE_CHAN(chan)->tx.mtu > mtu) {

Original file line number	Diff line number	Diff line change
`@@ -1295,7 +1295,7 @@ static void le_ecred_reconf_req(struct bt_l2cap *l2cap, uint8_t ident,`
`1295`	`1295`	`chan = bt_l2cap_le_lookup_tx_cid(conn, scid);`
`1296`	`1296`	`if (!chan) {`
`1297`	`1297`	`result = BT_L2CAP_RECONF_INVALID_CID;`
`1298`		`- continue;`
	`1298`	`+ goto response;`
`1299`	`1299`	`}`
`1300`	`1300`
`1301`	`1301`	`if (BT_L2CAP_LE_CHAN(chan)->tx.mtu > mtu) {`