Bluetooth: L2CAP: Fix invalid response to L2CAP_ECRED_RECONF_REQ
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v3 1/1 Bluetooth: L2CAP: Fix invalid response to L2CAP_ECRED_RECONF_REQ
From: Luiz Augusto von Dentz <[email protected]>
This fixes responding with an invalid result caused by checking the wrong size of CID which should have been (cmd_len - sizeof(*req)) and on top of it the wrong result was use L2CAP_CR_LE_INVALID_PARAMS which is invalid/reserved for reconf when running test like L2CAP/ECFC/BI-03-C:
Quoted 1 line
ACL Data RX: Handle 64 flags
0x02dlen 14
LE L2CAP: Enhanced Credit Reconfigure Request (0x19) ident 2 len 6
MTU: 64
MPS: 64
Source CID: 64
< ACL Data TX: Handle 64 flags 0x00 dlen 10
LE L2CAP: Enhanced Credit Reconfigure Respond (0x1a) ident 2 len 2
! Result: Reserved (0x000c)
Result: Reconfiguration failed - one or more Destination CIDs invalid (0x0003)Fiix L2CAP/ECFC/BI-04-C which expects L2CAP_RECONF_INVALID_MPS (0x0002) when more than one channel gets its MPS reduced:
Quoted 1 line
ACL Data RX: Handle 64 flags
0x02dlen 16
LE L2CAP: Enhanced Credit Reconfigure Request (0x19) ident 2 len 8
MTU: 264
MPS: 99
Source CID: 64
! Source CID: 65
< ACL Data TX: Handle 64 flags 0x00 dlen 10
LE L2CAP: Enhanced Credit Reconfigure Respond (0x1a) ident 2 len 2
! Result: Reconfiguration successful (0x0000)
Result: Reconfiguration failed - reduction in size of MPS not allowed for more than one channel at a time (0x0002)Fix L2CAP/ECFC/BI-05-C when SCID is invalid (85 unconnected):
Quoted 1 line
ACL Data RX: Handle 64 flags
0x02dlen 14
LE L2CAP: Enhanced Credit Reconfigure Request (0x19) ident 2 len 6
MTU: 65
MPS: 64
! Source CID: 85
< ACL Data TX: Handle 64 flags 0x00 dlen 10
LE L2CAP: Enhanced Credit Reconfigure Respond (0x1a) ident 2 len 2
! Result: Reconfiguration successful (0x0000)
Result: Reconfiguration failed - one or more Destination CIDs invalid (0x0003)Fix L2CAP/ECFC/BI-06-C when MPS < L2CAP_ECRED_MIN_MPS (64):
Quoted 1 line
ACL Data RX: Handle 64 flags
0x02dlen 14
LE L2CAP: Enhanced Credit Reconfigure Request (0x19) ident 2 len 6
MTU: 672
! MPS: 63
Source CID: 64
< ACL Data TX: Handle 64 flags 0x00 dlen 10
LE L2CAP: Enhanced Credit Reconfigure Respond (0x1a) ident 2 len 2
! Result: Reconfiguration failed - reduction in size of MPS not allowed for more than one channel at a time (0x0002)
Result: Reconfiguration failed - other unacceptable parameters (0x0004)Fix L2CAP/ECFC/BI-07-C when MPS reduced for more than one channel:
Quoted 1 line
ACL Data RX: Handle 64 flags
0x02dlen 16
LE L2CAP: Enhanced Credit Reconfigure Request (0x19) ident 3 len 8
MTU: 84! MPS: 71
Source CID: 64
! Source CID: 65
< ACL Data TX: Handle 64 flags 0x00 dlen 10
LE L2CAP: Enhanced Credit Reconfigure Respond (0x1a) ident 2 len 2
! Result: Reconfiguration successful (0x0000)
Result: Reconfiguration failed - reduction in size of MPS not allowed for more than one channel at a time (0x0002)--- include/net/bluetooth/l2cap.h | 2 + net/bluetooth/l2cap_core.c | 71 ++++++++++++++++++++++++----------- 2 files changed, 51 insertions(+), 22 deletions(-)
include/net/bluetooth/l2cap.h +2 -0
@@ -493,6 +493,8 @@ struct l2cap_ecred_reconf_req {#define L2CAP_RECONF_SUCCESS 0x0000#define L2CAP_RECONF_INVALID_MTU 0x0001#define L2CAP_RECONF_INVALID_MPS 0x0002 +#define L2CAP_RECONF_INVALID_CID 0x0003 +#define L2CAP_RECONF_INVALID_PARAMS 0x0004struct l2cap_ecred_reconf_rsp {__le16 result;
net/bluetooth/l2cap_core.c +49 -22
105 lines not on this page · raw message
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=1051296
---Test result---
Test Summary:
CheckPatch PENDING 0.34 seconds GitLint PENDING 0.37 seconds SubjectPrefix PASS 0.12 seconds BuildKernel PASS 26.23 seconds CheckAllWarning PASS 28.92 seconds CheckSparse WARNING 32.28 seconds BuildKernel32 PASS 25.41 seconds TestRunnerSetup PASS 568.01 seconds TestRunner_l2cap-tester PASS 28.46 seconds TestRunner_iso-tester PASS 86.33 seconds TestRunner_bnep-tester PASS 6.42 seconds TestRunner_mgmt-tester FAIL 126.37 seconds TestRunner_rfcomm-tester PASS 9.69 seconds TestRunner_sco-tester FAIL 14.67 seconds TestRunner_ioctl-tester PASS 10.30 seconds TestRunner_mesh-tester FAIL 12.52 seconds TestRunner_smp-tester PASS 8.86 seconds TestRunner_userchan-tester PASS 6.75 seconds IncrementalBuild PENDING 1.00 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:7762:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7763:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7765:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7766: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.107 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 2.733 seconds Mesh - Send cancel - 2 Timed out 1.992 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 8 lines · On Thu, 5 Feb 2026 14:57:42 -0500 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This fixes responding with an invalid result caused by checking the wrong size of CID which should have been (
cmd_len-sizeof(*req)) and on top of it the wrong result was useL2CAP_CR_LE_INVALID_PARAMSwhich is invalid/reserved for reconf when running test like L2CAP/ECFC/BI-03-C:[...]
Here is the summary with links:
- [v3] Bluetooth: L2CAP: Fix invalid response to L2CAP_ECRED_RECONF_REQ
https://git.kernel.org/bluetooth/bluetooth-next/c/13f98d3499ab
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
On Thu, 2026-02-05 at 14:57 -0500, Luiz Augusto von Dentz wrote:
[...]
Quoted 2 lines
net/bluetooth/l2cap_core.c +0
-0
[...]
net/bluetooth/l2cap_core.c static inline int l2cap_ecred_reconf_req(struct l2cap_conn *conn, · line 5381
Quoted 7 lines
net/bluetooth/l2cap_core.c +7
-0+/* If more than one channel is being configured, the MPS field +* shall be greater than or equal to the current MPS size of +* each of these channels. If only one channel is being +* configured, the MPS field may be less than the current MPS +* of that channel. +*/ +if (chan[i]->remote_mps >= mps && i) {
The comment and the actual condition here don't match, so one of them is wrong:
1. This rejects an attempt to set an MPS size equal to the current value, but the comment says an equal value is OK.
2. This checks whether a second or subsequent channel is being configured, but the comment says we should consider the number of channels being configured, which would mean num_scid > 1 rather than i != 0.
Ben.
Quoted 14 lines
net/bluetooth/l2cap_core.c +11
-0+BT_ERR ("chan %p decreased MPS %u -> %u" , chan[i], + chan[i]->remote_mps, mps); + result =L2CAP_RECONF_INVALID_MPS ; + goto respond; + } + } + +/* Commit the new MTU and MPS values after checking they are valid */ +for (i =0 ; i < num_scid; i++) { + chan[i]->omtu = mtu; + chan[i]->remote_mps = mps; } respond:
Signature · 2 lines
Ben Hutchings Theory and practice are closer in theory than in practice - John Levine
Luiz Augusto von Dentz
maintainerHi Ben,
Quoted 17 lines · Ben Hutchings
On Thu, 2026-02-05 at 14:57 -0500, Luiz Augusto von Dentz wrote:
[...]Quoted 2 lines
net/bluetooth/l2cap_core.c +0
-0[...]
net/bluetooth/l2cap_core.c static inline int l2cap_ecred_reconf_req(struct l2cap_conn *conn, · line 5381
Quoted 7 lines
net/bluetooth/l2cap_core.c +7
-0+/* If more than one channel is being configured, the MPS field +* shall be greater than or equal to the current MPS size of +* each of these channels. If only one channel is being +* configured, the MPS field may be less than the current MPS +* of that channel. +*/ +if (chan[i]->remote_mps >= mps && i) {The comment and the actual condition here don't match, so one of them is wrong:
Quoted 6 lines
1. This rejects an attempt to set an MPS size equal to the current value, but the comment says an equal value is OK.
2. This checks whether a second or subsequent channel is being configured, but the comment says we should consider the number of channels being configured, which would meannum_scid> 1 rather than i != 0.
Right, nice catch. Do you want to spin a patch fixing this?
Quoted 20 lines
Ben.
Quoted 4 lines
net/bluetooth/l2cap_core.c +4
-0+BT_ERR ("chan %p decreased MPS %u -> %u" , chan[i], + chan[i]->remote_mps, mps); + result =L2CAP_RECONF_INVALID_MPS ; + goto respond;net/bluetooth/l2cap_core.c static inline int l2cap_ecred_reconf_req(struct l2cap_conn *conn, · line 5395
Quoted 10 lines
net/bluetooth/l2cap_core.c +7
-0+ } + } + +/* Commit the new MTU and MPS values after checking they are valid */ +for (i =0 ; i < num_scid; i++) { + chan[i]->omtu = mtu; + chan[i]->remote_mps = mps; } respond:--
Ben Hutchings
Theory and practice are closer in theory than in practice - John Levine
Signature · 1 line
Luiz Augusto von Dentz