Bluetooth: RFCOMM: FIX possible deadlock in rfcomm_sk_state_change
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH 1/1 Bluetooth: RFCOMM: FIX possible deadlock in rfcomm_sk_state_change
From: Luiz Augusto von Dentz <[email protected]>
rfcomm_sk_state_change attempts to use sock_lock so it must never be called with it locked but rfcomm_sock_ioctl always attempt to lock it causing the following trace:
======================================================
WARNING: possible circular locking dependency detected
6.8.0-syzkaller-08951-gfe46a7dd189e #0 Not tainted
------------------------------------------------------
syz-executor386/5093 is trying to acquire lock:ffff88807c396258 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at: lock_sock include/net/sock.h:1671 [inline] ffff88807c396258 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at: rfcomm_sk_state_change+0x5b/0x310 net/bluetooth/rfcomm/sock.c:73
but task is already holding lock:ffff88807badfd28 (&d->lock){+.+.}-{3:3}, at: __rfcomm_dlc_close+0x226/0x6a0 net/bluetooth/rfcomm/core.c:491
--- net/bluetooth/rfcomm/sock.c | 2 -- 1 file changed, 2 deletions(-)
net/bluetooth/rfcomm/sock.c +0 -2
@@ -865,9 +865,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lonif (err == -ENOIOCTLCMD ) {#ifdef CONFIG_BT_RFCOMM_TTY -lock_sock (sk); err =rfcomm_dev_ioctl (sk, cmd, (void __user *) arg); -release_sock (sk);#else err = -EOPNOTSUPP ;#endif
Signature · 1 line
2.46.1
Luiz Augusto von Dentz
maintainerQuoted 43 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
rfcomm_sk_state_changeattempts to usesock_lockso it must never be called with it locked butrfcomm_sock_ioctlalways attempt to lock it causing the following trace:======================================================
WARNING: possible circular locking dependency detected
6.8.0-syzkaller-08951-gfe46a7dd189e #0 Not tainted
------------------------------------------------------
syz-executor386/5093 is trying to acquire lock:ffff88807c396258(sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at:lock_sockinclude/net/sock.h:1671[inline]ffff88807c396258(sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at:rfcomm_sk_state_change+0x5b/0x310net/bluetooth/rfcomm/sock.c:73but task is already holding lock:
ffff88807badfd28(&d->lock){+.+.}-{3:3}, at:__rfcomm_dlc_close+0x226/0x6a0net/bluetooth/rfcomm/core.c:491Reported-by [email protected]Fixes 3241ad820dbb ("[Bluetooth] Add timestamp support to L2CAP, RFCOMM and SCO")Signed-off-by Luiz Augusto von Dentz <[email protected]>--- net/bluetooth/rfcomm/sock.c | 2 -- 1 file changed, 2 deletions(-)net/bluetooth/rfcomm/sock.c +0
-3@@ -865,9 +865,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lonif (err == -ENOIOCTLCMD ) {#ifdef CONFIG_BT_RFCOMM_TTY -lock_sock (sk); err =rfcomm_dev_ioctl (sk, cmd, (void __user *) arg); -release_sock (sk);#else err = -EOPNOTSUPP ;#endif --2.46.1
Signature · 1 line
Luiz Augusto von Dentz
Luiz Augusto von Dentz
maintainer#syz test
Quoted 50 lines · Luiz Augusto von Dentz
Quoted 41 lines · Luiz Augusto von Dentz
From: Luiz Augusto von Dentz <[email protected]>
rfcomm_sk_state_changeattempts to usesock_lockso it must never be called with it locked butrfcomm_sock_ioctlalways attempt to lock it causing the following trace:======================================================
WARNING: possible circular locking dependency detected
6.8.0-syzkaller-08951-gfe46a7dd189e #0 Not tainted
------------------------------------------------------
syz-executor386/5093 is trying to acquire lock:ffff88807c396258(sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at:lock_sockinclude/net/sock.h:1671[inline]ffff88807c396258(sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at:rfcomm_sk_state_change+0x5b/0x310net/bluetooth/rfcomm/sock.c:73but task is already holding lock:
ffff88807badfd28(&d->lock){+.+.}-{3:3}, at:__rfcomm_dlc_close+0x226/0x6a0net/bluetooth/rfcomm/core.c:491Reported-by [email protected]Fixes 3241ad820dbb ("[Bluetooth] Add timestamp support to L2CAP, RFCOMM and SCO")Signed-off-by Luiz Augusto von Dentz <[email protected]>--- net/bluetooth/rfcomm/sock.c | 2 -- 1 file changed, 2 deletions(-)net/bluetooth/rfcomm/sock.c +0
-3@@ -865,9 +865,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lonif (err == -ENOIOCTLCMD ) {#ifdef CONFIG_BT_RFCOMM_TTY -lock_sock (sk); err =rfcomm_dev_ioctl (sk, cmd, (void __user *) arg); -release_sock (sk);#else err = -EOPNOTSUPP ;#endif --Quoted 2 lines
2.46.1
--
Luiz Augusto von Dentz
Signature · 1 line
Luiz Augusto von Dentz
From 9d651555ea532485cc38e759134e0c231c890eab Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <[email protected]>
Date: Mon, 30 Sep 2024 13:26:21 -0400
Subject: [PATCH v1] Bluetooth: RFCOMM: FIX possible deadlock in
rfcomm_sk_state_change
rfcomm_sk_state_change attempts to use sock_lock so it must never be called with it locked but rfcomm_sock_ioctl always attempt to lock it causing the following trace:
======================================================
WARNING: possible circular locking dependency detected
6.8.0-syzkaller-08951-gfe46a7dd189e #0 Not tainted
------------------------------------------------------
syz-executor386/5093 is trying to acquire lock:ffff88807c396258 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at: lock_sock include/net/sock.h:1671 [inline] ffff88807c396258 (sk_lock-AF_BLUETOOTH-BTPROTO_RFCOMM){+.+.}-{0:0}, at: rfcomm_sk_state_change+0x5b/0x310 net/bluetooth/rfcomm/sock.c:73
but task is already holding lock:ffff88807badfd28 (&d->lock){+.+.}-{3:3}, at: __rfcomm_dlc_close+0x226/0x6a0 net/bluetooth/rfcomm/core.c:491
--- net/bluetooth/rfcomm/sock.c | 2 -- 1 file changed, 2 deletions(-)
net/bluetooth/rfcomm/sock.c +0 -2
@@ -865,9 +865,7 @@ static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned lonif (err == -ENOIOCTLCMD ) {#ifdef CONFIG_BT_RFCOMM_TTY -lock_sock (sk); err =rfcomm_dev_ioctl (sk, cmd, (void __user *) arg); -release_sock (sk);#else err = -EOPNOTSUPP ;#endif
Signature · 1 line
2.46.1
Re: [syzbot] [bluetooth?] possible deadlock in rfcomm_sk_state_change
syzbot has tested the proposed patch and the reproducer did not trigger any issue:
Hello,
syzbot has tested the proposed patch and the reproducer did not trigger any issue:
Tested on:
commit: e32cde8d Merge tag 'sched_ext-for-6.12-rc1-fixes-1' of.. git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=12a33dd0580000 kernel config: https://syzkaller.appspot.com/x/.config?x=c9c87051d13eb9da dashboard link: https://syzkaller.appspot.com/bug?extid=d7ce59b06b3eb14fd218 compiler: Debian clang version 15.0.6, GNU ld (GNU Binutils for Debian) 2.40 patch: https://syzkaller.appspot.com/x/patch.diff?x=139c139f980000
Note: testing is done by a robot and is best-effort only.
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 Mon, 30 Sep 2024 15:30:44 -0400 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
rfcomm_sk_state_changeattempts to usesock_lockso it must never be called with it locked butrfcomm_sock_ioctlalways attempt to lock it causing the following trace:======================================================
WARNING: possible circular locking dependency detected 6.8.0-syzkaller-08951-gfe46a7dd189e #0 Not tainted[...]
Here is the summary with links:
- [v1] Bluetooth: RFCOMM: FIX possible deadlock in rfcomm_sk_state_change
https://git.kernel.org/bluetooth/bluetooth-next/c/ffb3f98d4dae
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html