Bluetooth: L2CAP: Fix missing unlock in l2cap_conless_channel

Commit Message

Tetsuo Handa July 27, 2024, 7:49 a.m. UTC

syzbot is reporting that l2cap_chan_unlock(chan) is missing.

Reported-by: syzbot <[e-mail]>
Closes: https://syzkaller.appspot.com/bug?extid=45ac74737e866894acb0
Fixes: f1a8f402f13f ("Bluetooth: L2CAP: Fix deadlock")
Signed-off-by: Tetsuo Handa <[e-mail]>
---
 net/bluetooth/l2cap_core.c | 1 +
 1 file changed, 1 insertion(+)

Comments

[e-mail] July 27, 2024, 8:36 a.m. UTC | #1

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=874220

---Test result---

Test Summary:
CheckPatch                    PASS      3.28 seconds
GitLint                       PASS      0.61 seconds
SubjectPrefix                 PASS      0.26 seconds
BuildKernel                   PASS      30.30 seconds
CheckAllWarning               PASS      32.67 seconds
CheckSparse                   PASS      42.00 seconds
CheckSmatch                   PASS      104.04 seconds
BuildKernel32                 PASS      29.17 seconds
TestRunnerSetup               PASS      533.89 seconds
TestRunner_l2cap-tester       PASS      22.18 seconds
TestRunner_iso-tester         PASS      35.03 seconds
TestRunner_bnep-tester        PASS      4.90 seconds
TestRunner_mgmt-tester        FAIL      116.36 seconds
TestRunner_rfcomm-tester      PASS      7.61 seconds
TestRunner_sco-tester         PASS      15.08 seconds
TestRunner_ioctl-tester       PASS      7.99 seconds
TestRunner_mesh-tester        PASS      5.99 seconds
TestRunner_smp-tester         PASS      6.97 seconds
TestRunner_userchan-tester    PASS      5.16 seconds
IncrementalBuild              PASS      29.91 seconds

Details
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 492, Passed: 489 (99.4%), Failed: 1, Not Run: 2

Failed Test Cases
LL Privacy - Add Device 7 (AL is full)               Failed       0.202 seconds


---
Regards,
Linux Bluetooth

[e-mail] Aug. 1, 2024, 8:20 a.m. UTC | #2

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <[e-mail]>:

On Sat, 27 Jul 2024 16:49:37 +0900 you wrote:
> syzbot is reporting that l2cap_chan_unlock(chan) is missing.
> 
> Reported-by: syzbot <[e-mail]>
> Closes: https://syzkaller.appspot.com/bug?extid=45ac74737e866894acb0
> Fixes: f1a8f402f13f ("Bluetooth: L2CAP: Fix deadlock")
> Signed-off-by: Tetsuo Handa <[e-mail]>
> 
> [...]

Here is the summary with links:
  - Bluetooth: L2CAP: Fix missing unlock in l2cap_conless_channel
    https://git.kernel.org/bluetooth/bluetooth-next/c/1e69bd3ba19c

You are awesome, thank you!

Patch

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index c3c26bbb5ddae..9988ba382b686 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -6774,6 +6774,7 @@  static void l2cap_conless_channel(struct l2cap_conn *conn, __le16 psm,
 	bt_cb(skb)->l2cap.psm = psm;
 
 	if (!chan->ops->recv(chan, skb)) {
+		l2cap_chan_unlock(chan);
 		l2cap_chan_put(chan);
 		return;
 	}