Bluetooth: L2CAP: Fix invalid response to L2CAP_ECRED_RECONF_REQ
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 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 10https://github.com/bluez/bluez/issues/1865
LE L2CAP: Enhanced Credit Reconfigure Respond (0x1a) ident 2 len 2
Result: Reserved (0x000c)So this fix the check and introduce the error L2CAP_RECONF_INVALID_CID (0x0003).
--- include/net/bluetooth/l2cap.h | 2 ++ net/bluetooth/l2cap_core.c | 4 ++-- 2 files changed, 4 insertions(+), 2 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 +2 -2
@@ -5316,8 +5316,8 @@ static inline int l2cap_ecred_reconf_req(struct l2cap_conn *conn,if (!enable_ecred)return -EINVAL ; -if (cmd_len <sizeof (*req) || cmd_len -sizeof (*req) %sizeof (u16)) { - result =L2CAP_CR_LE_INVALID_PARAMS ; +if (cmd_len <sizeof (*req) || (cmd_len -sizeof (*req)) %sizeof (u16)) { + result =L2CAP_RECONF_INVALID_CID ; goto respond; }
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=1050471
---Test result---
Test Summary:
CheckPatch PENDING 0.39 seconds GitLint PENDING 0.35 seconds SubjectPrefix PASS 0.08 seconds BuildKernel PASS 25.20 seconds CheckAllWarning PASS 28.24 seconds CheckSparse WARNING 31.35 seconds BuildKernel32 PASS 24.85 seconds TestRunnerSetup PASS 552.94 seconds TestRunner_l2cap-tester PASS 28.05 seconds TestRunner_iso-tester PASS 87.28 seconds TestRunner_bnep-tester PASS 6.20 seconds TestRunner_mgmt-tester FAIL 112.23 seconds TestRunner_rfcomm-tester PASS 9.52 seconds TestRunner_sco-tester FAIL 14.59 seconds TestRunner_ioctl-tester PASS 10.15 seconds TestRunner_mesh-tester FAIL 11.45 seconds TestRunner_smp-tester PASS 8.65 seconds TestRunner_userchan-tester PASS 6.74 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:7735:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7736:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7738:1: error: bad constant expressionnet/bluetooth/l2cap_core.c:7739: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 1.896 seconds Mesh - Send cancel - 2 Timed out 1.991 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth