Bluetooth: L2CAP: Fix result of L2CAP_ECRED_CONN_RSP when MTU is too short
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v3 1/1 Bluetooth: L2CAP: Fix result of L2CAP_ECRED_CONN_RSP when MTU is too short
From: Luiz Augusto von Dentz <[email protected]>
Test L2CAP/ECFC/BV-26-C expect the response to L2CAP_ECRED_CONN_REQ with and MTU value < L2CAP_ECRED_MIN_MTU (64) to be L2CAP_CR_LE_INVALID_PARAMS rather than L2CAP_CR_LE_UNACCEPT_PARAMS.
Also fix not including the correct number of CIDs in the response since the spec requires all CIDs being rejected to be included in the response.
--- include/net/bluetooth/l2cap.h | 6 +++--- net/bluetooth/l2cap_core.c | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-)
include/net/bluetooth/l2cap.h +3 -3
@@ -284,9 +284,9 @@ struct l2cap_conn_rsp {#define L2CAP_CR_LE_BAD_KEY_SIZE 0x0007#define L2CAP_CR_LE_ENCRYPTION 0x0008#define L2CAP_CR_LE_INVALID_SCID 0x0009 -#define L2CAP_CR_LE_SCID_IN_USE 0X000A -#define L2CAP_CR_LE_UNACCEPT_PARAMS 0X000B -#define L2CAP_CR_LE_INVALID_PARAMS 0X000C +#define L2CAP_CR_LE_SCID_IN_USE 0x000A +#define L2CAP_CR_LE_UNACCEPT_PARAMS 0x000B +#define L2CAP_CR_LE_INVALID_PARAMS 0x000C/* connect/create channel status */ #define L2CAP_CS_NO_INFO 0x0000
net/bluetooth/l2cap_core.c +8 -6
@@ -5051,13 +5051,15 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,struct l2cap_chan *chan, *pchan;u16 mtu, mps;__le16 psm; -u8 result, len =0 ; +u8 result, rsp_len =0 ;int i, num_scid;bool defer = false;if (!enable_ecred)return -EINVAL ; +memset (pdu,0 ,sizeof (*pdu)); +if (cmd_len <sizeof (*req) || (cmd_len -sizeof (*req)) %sizeof (u16)) { result =L2CAP_CR_LE_INVALID_PARAMS ; goto response;
@@ -5066,6 +5068,9 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn, cmd_len -=sizeof (*req); num_scid = cmd_len /sizeof (u16); +/* Always respond with the same number of scids as in the request */ + rsp_len = cmd_len; +if (num_scid >L2CAP_ECRED_MAX_CID ) { result =L2CAP_CR_LE_INVALID_PARAMS ; goto response;
@@ -5075,7 +5080,7 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn, mps =__le16_to_cpu (req->mps);if (mtu <L2CAP_ECRED_MIN_MTU || mps <L2CAP_ECRED_MIN_MPS ) { - result =L2CAP_CR_LE_UNACCEPT_PARAMS ; + result =L2CAP_CR_LE_INVALID_PARAMS ; goto response; }
@@ -5095,8 +5100,6 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,BT_DBG ("psm 0x%2.2x mtu %u mps %u" ,__le16_to_cpu (psm), mtu, mps); -memset (pdu,0 ,sizeof (*pdu)); -/* Check if we have socket listening on psm */ pchan =l2cap_global_chan_by_psm (BT_LISTEN , psm, &conn->hcon->src, &conn->hcon->dst,LE_LINK );
@@ -5121,7 +5124,6 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,BT_DBG ("scid[%d] 0x%4.4x" , i, scid); pdu->dcid[i] =0x0000 ; - len +=sizeof (*pdu->dcid);/* Check for valid dynamic CID range */ if (scid <L2CAP_CID_DYN_START || scid >L2CAP_CID_LE_DYN_END ) {
@@ -5188,7 +5190,7 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn,return 0 ;l2cap_send_cmd (conn, cmd->ident,L2CAP_ECRED_CONN_RSP , -sizeof (*pdu) + len, pdu); +sizeof (*pdu) + rsp_len, pdu);return 0 ; }
Signature · 1 line
2.52.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=1052898
---Test result---
Test Summary:
CheckPatch PENDING 0.39 seconds GitLint PENDING 0.31 seconds SubjectPrefix PASS 0.13 seconds BuildKernel PASS 25.58 seconds CheckAllWarning PASS 27.97 seconds CheckSparse WARNING 31.73 seconds BuildKernel32 PASS 24.92 seconds TestRunnerSetup PASS 554.47 seconds TestRunner_l2cap-tester PASS 27.83 seconds TestRunner_iso-tester PASS 73.62 seconds TestRunner_bnep-tester PASS 6.46 seconds TestRunner_mgmt-tester FAIL 117.39 seconds TestRunner_rfcomm-tester PASS 9.64 seconds TestRunner_sco-tester FAIL 14.43 seconds TestRunner_ioctl-tester PASS 10.15 seconds TestRunner_mesh-tester FAIL 11.48 seconds TestRunner_smp-tester PASS 8.62 seconds TestRunner_userchan-tester PASS 6.69 seconds IncrementalBuild PENDING 0.68 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:net/bluetooth/l2cap_core.c:7764:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7765:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7767:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7768:1: error: bad constant expression
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
Read Exp Feature - Success Failed 0.100 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
BUG: sleeping function called from invalid context at net/core/sock.c:3782
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 1.856 seconds Mesh - Send cancel - 2 Timed out 1.994 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 11 lines · On Tue, 10 Feb 2026 16:27:22 -0500 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
Test L2CAP/ECFC/BV-26-C expect the response to
L2CAP_ECRED_CONN_REQwith and MTU value <L2CAP_ECRED_MIN_MTU(64) to beL2CAP_CR_LE_INVALID_PARAMSrather thanL2CAP_CR_LE_UNACCEPT_PARAMS.Also fix not including the correct number of CIDs in the response since the spec requires all CIDs being rejected to be included in the response.
[...]
Here is the summary with links:
- [v3] Bluetooth: L2CAP: Fix result of L2CAP_ECRED_CONN_RSP when MTU is too short
https://git.kernel.org/bluetooth/bluetooth-next/c/5c3d538e7be5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html