Skip to contentSkip to conversation

Bluetooth: ensure valid channel mode when creating l2cap conn on LE

PATCH In review [email protected] 3 participants 5 messages Jan 12, 2022 – Jan 19, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Bluetooth: ensure valid channel mode when creating l2cap conn on LE

From: Gavin Li <[email protected]>

After creating a socket(AF_INET, SOCK_STREAM, BTPROTO_L2CAP) socket and connect()'ing to a LE device with default settings (no setsockopt), upon the first sendmsg, the following BUG occurs because chan->mode==L2CAP_MODE_ERTM, causing l2cap_ertm_send() -> __set_retrans_timer() -> schedule_delayed_work() on l2cap_chan.retrans_timer, which was never initialized because l2cap_ertm_init() was never called to initialize it.

  Call Trace:
   queue_delayed_work_on+0x36/0x40
   l2cap_ertm_send.isra.0+0x14d/0x2d0 [bluetooth]
   l2cap_tx+0x361/0x510 [bluetooth]
   l2cap_chan_send+0xb26/0xb50 [bluetooth]
   l2cap_sock_sendmsg+0xc9/0x100 [bluetooth]
   sock_sendmsg+0x5e/0x60
   sock_write_iter+0x97/0x100
   new_sync_write+0x1d3/0x1f0
   vfs_write+0x1b4/0x270
   ksys_write+0xaf/0xe0
   do_syscall_64+0x33/0x40
   entry_SYSCALL_64_after_hwframe+0x44/0xa9

This patch ensures that when connecting to a LE device, chan->mode will always be corrected to L2CAP_MODE_LE_FLOWCTL if it is invalid for LE.

---
 net/bluetooth/l2cap_sock.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_sock.c +13 -2
index 160c016a5dfb9..58c06ef32656c 100644
@@ -78,6 +78,17 @@ static int l2cap_validate_le_psm(u16 psm)
 	return 0;
 }
 
+static bool l2cap_mode_supports_le(u8 mode)
+{
+	switch (mode) {
+		case L2CAP_MODE_LE_FLOWCTL:
+		case L2CAP_MODE_EXT_FLOWCTL:
+			return true;
+		default:
+			return false;
+	}
+}
+
 static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 {
 	struct sock *sk = sock->sk;
@@ -161,7 +172,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 		break;
 	}
 
-	if (chan->psm && bdaddr_type_is_le(chan->src_type))
+	if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
 		chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
 	chan->state = BT_BOUND;
@@ -240,7 +251,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
 			return -EINVAL;
 	}
 
-	if (chan->psm && bdaddr_type_is_le(chan->src_type) && !chan->mode)
+	if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
 		chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
 	err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
Signature · 1 line
2.34.1
#1 lore raw

Hi,

Quoted 73 lines · On Wed, Jan 12, 2022 at 2:17 AM <[email protected]> wrote:

From: Gavin Li <[email protected]>

After creating a socket(AF_INET, SOCK_STREAM, BTPROTO_L2CAP) socket and connect()'ing to a LE device with default settings (no setsockopt), upon the first sendmsg, the following BUG occurs because chan->mode==L2CAP_MODE_ERTM, causing l2cap_ertm_send() -> __set_retrans_timer() -> schedule_delayed_work() on l2cap_chan.retrans_timer, which was never initialized because l2cap_ertm_init() was never called to initialize it.

  Call Trace:
   queue_delayed_work_on+0x36/0x40
   l2cap_ertm_send.isra.0+0x14d/0x2d0 [bluetooth]
   l2cap_tx+0x361/0x510 [bluetooth]
   l2cap_chan_send+0xb26/0xb50 [bluetooth]
   l2cap_sock_sendmsg+0xc9/0x100 [bluetooth]
   sock_sendmsg+0x5e/0x60
   sock_write_iter+0x97/0x100
   new_sync_write+0x1d3/0x1f0
   vfs_write+0x1b4/0x270
   ksys_write+0xaf/0xe0
   do_syscall_64+0x33/0x40
   entry_SYSCALL_64_after_hwframe+0x44/0xa9

This patch ensures that when connecting to a LE device, chan->mode will always be corrected to L2CAP_MODE_LE_FLOWCTL if it is invalid for LE.

---
 net/bluetooth/l2cap_sock.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_sock.c +13 -3
index 160c016a5dfb9..58c06ef32656c 100644
@@ -78,6 +78,17 @@ static int l2cap_validate_le_psm(u16 psm)
        return 0;
 }
 
+static bool l2cap_mode_supports_le(u8 mode)
+{
+       switch (mode) {
+               case L2CAP_MODE_LE_FLOWCTL:
+               case L2CAP_MODE_EXT_FLOWCTL:
+                       return true;
+               default:
+                       return false;
+       }
+}
+
 static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 {
        struct sock *sk = sock->sk;
@@ -161,7 +172,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
                break;
        }
 
-       if (chan->psm && bdaddr_type_is_le(chan->src_type))
+       if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
                chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
        chan->state = BT_BOUND;
@@ -240,7 +251,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
                        return -EINVAL;
        }
 
-       if (chan->psm && bdaddr_type_is_le(chan->src_type) && !chan->mode)
+       if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
                chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
        err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
--
Quoted 1 line

2.34.1

Doesn't apply to bluetooth-next:

https://github.com/bluez/bluez/issues/250

Signature · 1 line
Luiz Augusto von Dentz
#2 lore raw

Hi,

Quoted 75 lines · Luiz Augusto von Dentz

Hi,

Quoted 71 lines · On Wed, Jan 12, 2022 at 2:17 AM <[email protected]> wrote:

From: Gavin Li <[email protected]>

After creating a socket(AF_INET, SOCK_STREAM, BTPROTO_L2CAP) socket and connect()'ing to a LE device with default settings (no setsockopt), upon the first sendmsg, the following BUG occurs because chan->mode==L2CAP_MODE_ERTM, causing l2cap_ertm_send() -> __set_retrans_timer() -> schedule_delayed_work() on l2cap_chan.retrans_timer, which was never initialized because l2cap_ertm_init() was never called to initialize it.

  Call Trace:
   queue_delayed_work_on+0x36/0x40
   l2cap_ertm_send.isra.0+0x14d/0x2d0 [bluetooth]
   l2cap_tx+0x361/0x510 [bluetooth]
   l2cap_chan_send+0xb26/0xb50 [bluetooth]
   l2cap_sock_sendmsg+0xc9/0x100 [bluetooth]
   sock_sendmsg+0x5e/0x60
   sock_write_iter+0x97/0x100
   new_sync_write+0x1d3/0x1f0
   vfs_write+0x1b4/0x270
   ksys_write+0xaf/0xe0
   do_syscall_64+0x33/0x40
   entry_SYSCALL_64_after_hwframe+0x44/0xa9

This patch ensures that when connecting to a LE device, chan->mode will always be corrected to L2CAP_MODE_LE_FLOWCTL if it is invalid for LE.

---
 net/bluetooth/l2cap_sock.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_sock.c +13 -2
index 160c016a5dfb9..58c06ef32656c 100644
@@ -78,6 +78,17 @@ static int l2cap_validate_le_psm(u16 psm)
        return 0;
 }
 
+static bool l2cap_mode_supports_le(u8 mode)
+{
+       switch (mode) {
+               case L2CAP_MODE_LE_FLOWCTL:
+               case L2CAP_MODE_EXT_FLOWCTL:
+                       return true;
+               default:
+                       return false;
+       }
+}
+
 static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 {
        struct sock *sk = sock->sk;
@@ -161,7 +172,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
                break;
        }
 
-       if (chan->psm && bdaddr_type_is_le(chan->src_type))
+       if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
                chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
        chan->state = BT_BOUND;
@@ -240,7 +251,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
                        return -EINVAL;
        }
 
-       if (chan->psm && bdaddr_type_is_le(chan->src_type) && !chan->mode)
+       if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
                chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
Quoted 7 lines
Quoted 3 lines
net/bluetooth/l2cap_sock.c +0 -1
        err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
--

2.34.1

Doesn't apply to bluetooth-next:

https://github.com/bluez/bluez/issues/250

Please disregard the link above, Ive meant to paste:

Applying: Bluetooth: ensure valid channel mode when creating l2cap conn on LE
error: patch failed: net/bluetooth/l2cap_sock.c:161
error: net/bluetooth/l2cap_sock.c: patch does not apply

I did fix something similar:

https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=30d57722732d9736554f85f75f9d7ad5402d192e

Signature · 1 line
Luiz Augusto von Dentz
author
#3 lore raw

This looks good; thanks for catching that.

Gavin

Quoted 100 lines · Luiz Augusto von Dentz

Hi,

Quoted 75 lines · Luiz Augusto von Dentz

Hi,

Quoted 71 lines · On Wed, Jan 12, 2022 at 2:17 AM <[email protected]> wrote:

From: Gavin Li <[email protected]>

After creating a socket(AF_INET, SOCK_STREAM, BTPROTO_L2CAP) socket and connect()'ing to a LE device with default settings (no setsockopt), upon the first sendmsg, the following BUG occurs because chan->mode==L2CAP_MODE_ERTM, causing l2cap_ertm_send() -> __set_retrans_timer() -> schedule_delayed_work() on l2cap_chan.retrans_timer, which was never initialized because l2cap_ertm_init() was never called to initialize it.

  Call Trace:
   queue_delayed_work_on+0x36/0x40
   l2cap_ertm_send.isra.0+0x14d/0x2d0 [bluetooth]
   l2cap_tx+0x361/0x510 [bluetooth]
   l2cap_chan_send+0xb26/0xb50 [bluetooth]
   l2cap_sock_sendmsg+0xc9/0x100 [bluetooth]
   sock_sendmsg+0x5e/0x60
   sock_write_iter+0x97/0x100
   new_sync_write+0x1d3/0x1f0
   vfs_write+0x1b4/0x270
   ksys_write+0xaf/0xe0
   do_syscall_64+0x33/0x40
   entry_SYSCALL_64_after_hwframe+0x44/0xa9

This patch ensures that when connecting to a LE device, chan->mode will always be corrected to L2CAP_MODE_LE_FLOWCTL if it is invalid for LE.

---
 net/bluetooth/l2cap_sock.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_sock.c +13 -2
index 160c016a5dfb9..58c06ef32656c 100644
@@ -78,6 +78,17 @@ static int l2cap_validate_le_psm(u16 psm)
        return 0;
 }
 
+static bool l2cap_mode_supports_le(u8 mode)
+{
+       switch (mode) {
+               case L2CAP_MODE_LE_FLOWCTL:
+               case L2CAP_MODE_EXT_FLOWCTL:
+                       return true;
+               default:
+                       return false;
+       }
+}
+
 static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 {
        struct sock *sk = sock->sk;
@@ -161,7 +172,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
                break;
        }
 
-       if (chan->psm && bdaddr_type_is_le(chan->src_type))
+       if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
                chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
        chan->state = BT_BOUND;
@@ -240,7 +251,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
                        return -EINVAL;
        }
 
-       if (chan->psm && bdaddr_type_is_le(chan->src_type) && !chan->mode)
+       if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
                chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
Quoted 7 lines
Quoted 3 lines
net/bluetooth/l2cap_sock.c +0 -1
        err = l2cap_chan_connect(chan, la.l2_psm, __le16_to_cpu(la.l2_cid),
--

2.34.1

Doesn't apply to bluetooth-next:

https://github.com/bluez/bluez/issues/250

Please disregard the link above, Ive meant to paste:

Applying: Bluetooth: ensure valid channel mode when creating l2cap conn on LE
error: patch failed: net/bluetooth/l2cap_sock.c:161
error: net/bluetooth/l2cap_sock.c: patch does not apply

I did fix something similar:

https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git/commit/?id=30d57722732d9736554f85f75f9d7ad5402d192e

--
Luiz Augusto von Dentz

maintainer
#4 lore raw
In reply to [email protected]

Hi Gavin,

Quoted 38 lines

After creating a socket(AF_INET, SOCK_STREAM, BTPROTO_L2CAP) socket and connect()'ing to a LE device with default settings (no setsockopt), upon the first sendmsg, the following BUG occurs because chan->mode==L2CAP_MODE_ERTM, causing l2cap_ertm_send() -> __set_retrans_timer() -> schedule_delayed_work() on l2cap_chan.retrans_timer, which was never initialized because l2cap_ertm_init() was never called to initialize it.

 Call Trace:
  queue_delayed_work_on+0x36/0x40
  l2cap_ertm_send.isra.0+0x14d/0x2d0 [bluetooth]
  l2cap_tx+0x361/0x510 [bluetooth]
  l2cap_chan_send+0xb26/0xb50 [bluetooth]
  l2cap_sock_sendmsg+0xc9/0x100 [bluetooth]
  sock_sendmsg+0x5e/0x60
  sock_write_iter+0x97/0x100
  new_sync_write+0x1d3/0x1f0
  vfs_write+0x1b4/0x270
  ksys_write+0xaf/0xe0
  do_syscall_64+0x33/0x40
  entry_SYSCALL_64_after_hwframe+0x44/0xa9

This patch ensures that when connecting to a LE device, chan->mode will always be corrected to L2CAP_MODE_LE_FLOWCTL if it is invalid for LE.

---
net/bluetooth/l2cap_sock.c | 15 +++++++++++++--

1 file changed, 13 insertions(+), 2 deletions(-)
net/bluetooth/l2cap_sock.c +1 -0
index 160c016a5dfb9..58c06ef32656c 100644
@@ -78,6 +78,17 @@ static int l2cap_validate_le_psm(u16 psm)
 	return 0;
 }
 
+static bool l2cap_mode_supports_le(u8 mode)

net/bluetooth/l2cap_sock.c static int l2cap_validate_le_psm(u16 psm) · line 91

Quoted 10 lines
net/bluetooth/l2cap_sock.c +10 -0
+{
+	switch (mode) {
+		case L2CAP_MODE_LE_FLOWCTL:
+		case L2CAP_MODE_EXT_FLOWCTL:
+			return true;
+		default:
+			return false;
+	}
+}
+

please use correct coding style.

Quoted 13 lines
net/bluetooth/l2cap_sock.c +1 -1
 static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 {
 	struct sock *sk = sock->sk;
@@ -161,7 +172,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
 		break;
 	}
 
-	if (chan->psm && bdaddr_type_is_le(chan->src_type))
+	if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
 		chan->mode = L2CAP_MODE_LE_FLOWCTL;
 
 	chan->state = BT_BOUND;

net/bluetooth/l2cap_sock.c static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, · line 255

Quoted 6 lines
net/bluetooth/l2cap_sock.c +1 -1
@@ -240,7 +251,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
 			return -EINVAL;
 	}
 
-	if (chan->psm && bdaddr_type_is_le(chan->src_type) && !chan->mode)
+	if (chan->psm && bdaddr_type_is_le(la.l2_bdaddr_type) && !l2cap_mode_supports_le(chan->mode))
 		chan->mode = L2CAP_MODE_LE_FLOWCTL;

And you need to add a proper multi-line if clause here.

Regards

Marcel