Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()

Commit Message

Dmitry Antipov July 31, 2024, 9:19 a.m. UTC

Add missing call to 'l2cap_chan_unlock()' on receive error handling
path in 'l2cap_conless_channel()'.

Fixes: a24cce144b98 ("Bluetooth: Fix reference counting of global L2CAP channels")
Reported-by: [e-mail]
Closes: https://syzkaller.appspot.com/bug?extid=45ac74737e866894acb0
Signed-off-by: Dmitry Antipov <[e-mail]>
---
 net/bluetooth/l2cap_core.c | 1 +
 1 file changed, 1 insertion(+)

Comments

[e-mail] July 31, 2024, 9:58 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=875380

---Test result---

Test Summary:
CheckPatch                    PASS      0.66 seconds
GitLint                       PASS      0.31 seconds
SubjectPrefix                 PASS      0.11 seconds
BuildKernel                   PASS      30.42 seconds
CheckAllWarning               PASS      32.76 seconds
CheckSparse                   PASS      38.48 seconds
CheckSmatch                   PASS      103.46 seconds
BuildKernel32                 PASS      29.82 seconds
TestRunnerSetup               PASS      538.73 seconds
TestRunner_l2cap-tester       PASS      22.30 seconds
TestRunner_iso-tester         PASS      37.69 seconds
TestRunner_bnep-tester        PASS      4.94 seconds
TestRunner_mgmt-tester        PASS      117.50 seconds
TestRunner_rfcomm-tester      PASS      7.59 seconds
TestRunner_sco-tester         PASS      13.03 seconds
TestRunner_ioctl-tester       PASS      8.13 seconds
TestRunner_mesh-tester        PASS      6.10 seconds
TestRunner_smp-tester         PASS      6.98 seconds
TestRunner_userchan-tester    PASS      5.14 seconds
IncrementalBuild              PASS      28.55 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 Wed, 31 Jul 2024 12:19:36 +0300 you wrote:
> Add missing call to 'l2cap_chan_unlock()' on receive error handling
> path in 'l2cap_conless_channel()'.
> 
> Fixes: a24cce144b98 ("Bluetooth: Fix reference counting of global L2CAP channels")
> Reported-by: [e-mail]
> Closes: https://syzkaller.appspot.com/bug?extid=45ac74737e866894acb0
> Signed-off-by: Dmitry Antipov <[e-mail]>
> 
> [...]

Here is the summary with links:
  - Bluetooth: l2cap: always unlock channel 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 c3c26bbb5dda..9988ba382b68 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;
 	}