Bluetooth: L2CAP: Fix possible crash on l2cap_ecred_conn_rsp
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v3 1/1 Bluetooth: L2CAP: Fix possible crash on l2cap_ecred_conn_rsp
From: Luiz Augusto von Dentz <[email protected]>
If dcid is received for an already-assigned destination CID the spec requires that both channels to be discarded, but calling l2cap_chan_del may invalidate the tmp cursor created by list_for_each_entry_safe and in fact it is the wrong procedure as the chan->dcid may be assigned previously it really needs to be disconnected.
Calling l2cap_chan_clone directly may still lead to l2cap_chan_del so instead schedule l2cap_chan_timeout with delay 0 to close the channel asynchronously.
--- net/bluetooth/l2cap_core.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
net/bluetooth/l2cap_core.c +15 -7
@@ -5244,7 +5244,7 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,struct l2cap_ecred_conn_rsp *rsp = (void *) data;struct hci_conn *hcon = conn->hcon;u16 mtu, mps, credits, result; -struct l2cap_chan *chan, *tmp; +struct l2cap_chan *chan, *tmp, *orig =NULL ;int err =0 , sec_level;int i =0 ;
@@ -5264,7 +5264,7 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,list_for_each_entry_safe (chan, tmp, &conn->chan_l, list) {u16 dcid; -if (chan->ident != cmd->ident || +if (orig == chan || chan->ident != cmd->ident || chan->mode !=L2CAP_MODE_EXT_FLOWCTL || chan->state ==BT_CONNECTED )continue ;
@@ -5283,8 +5283,10 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,BT_DBG ("dcid[%d] 0x%4.4x" , i, dcid); + orig =__l2cap_get_chan_by_dcid (conn, dcid); +/* Check if dcid is already in use */ -if (dcid &&__l2cap_get_chan_by_dcid (conn, dcid)) { +if (dcid && orig) {/* If a device receives a * L2CAP_CREDIT_BASED_CONNECTION_RSP packet with an * already-assigned Destination CID, then both the
@@ -5293,10 +5295,16 @@ static inline int l2cap_ecred_conn_rsp(struct l2cap_conn *conn,*/ l2cap_chan_del (chan,ECONNREFUSED );l2cap_chan_unlock (chan); - chan =__l2cap_get_chan_by_dcid (conn, dcid); -l2cap_chan_lock (chan); -l2cap_chan_del (chan,ECONNRESET ); -l2cap_chan_unlock (chan); +l2cap_chan_lock (orig); +/* Disconnect the original channel as it may be +* considered connected since dcid has already been +* assigned; don't call l2cap_chan_close directly +* since that could lead to l2cap_chan_del and then +* removing the channel from the list while we're +* iterating over it. +*/ +__set_chan_timer (orig,0 ); +l2cap_chan_unlock (orig);continue ; }
Signature · 1 line
2.53.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1098993
---Test result---
Test Summary:
CheckPatch PASS 0.76 seconds VerifyFixes PASS 0.14 seconds VerifySignedoff PASS 0.14 seconds GitLint PASS 0.34 seconds SubjectPrefix PASS 0.13 seconds BuildKernel PASS 24.91 seconds CheckAllWarning PASS 27.98 seconds CheckSparse PASS 26.40 seconds BuildKernel32 PASS 24.55 seconds TestRunnerSetup PASS 529.10 seconds TestRunner_l2cap-tester PASS 59.90 seconds IncrementalBuild PASS 23.97 seconds
https://github.com/bluez/bluetooth-next/pull/232
---
Regards,
Linux Bluetooth