Bluetooth: L2CAP: Fix not checking output MTU is acceptable on L2CAP_ECRED_CONN_REQ
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v3 1/1 Bluetooth: L2CAP: Fix not checking output MTU is acceptable on L2CAP_ECRED_CONN_REQ
From: Luiz Augusto von Dentz <[email protected]>
In order for L2CAP_ECRED_CONN_REQ the given MTU shall be checked against the suggested MTU of the listening socket as that is required by the likes of PTS L2CAP/ECFC/BV-27-C test which expects L2CAP_CR_LE_UNACCEPT_PARAMS if the MTU is lowers than socket omtu.
In order to be able to set chan->omtu the code now allows setting setsockopt(BT_SNDMTU), but it is only allowed when connection has not been stablished.
--- net/bluetooth/l2cap_core.c | 8 ++++++++ net/bluetooth/l2cap_sock.c | 15 +++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
net/bluetooth/l2cap_core.c +8 -0
@@ -5117,6 +5117,14 @@ static inline int l2cap_ecred_conn_req(struct l2cap_conn *conn, goto unlock; } +/* Check if the listening channel has set an output MTU then the +* requested MTU shall be less than or equal to that value. +*/ +if (pchan->omtu && mtu < pchan->omtu) { + result =L2CAP_CR_LE_UNACCEPT_PARAMS ; + goto unlock; + } + result =L2CAP_CR_LE_SUCCESS ;for (i =0 ; i < num_scid; i++) {
net/bluetooth/l2cap_sock.c +11 -4
@@ -1029,10 +1029,17 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,break ; } -/* Setting is not supported as it's the remote side that -* decides this. -*/ - err = -EPERM ; +/* Only allow setting output MTU when not connected */ +if (sk->sk_state ==BT_CONNECTED ) { + err = -EISCONN ; +break ; + } + + err =copy_safe_from_sockptr (&mtu,sizeof (mtu), optval, optlen); +if (err) +break ; + + chan->omtu = mtu;break ;case BT_RCVMTU :
Signature · 1 line
2.52.0
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 8 lines · On Fri, 20 Feb 2026 09:09:30 -0500 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
In order for
L2CAP_ECRED_CONN_REQthe given MTU shall be checked against the suggested MTU of the listening socket as that is required by the likes of PTS L2CAP/ECFC/BV-27-C test which expectsL2CAP_CR_LE_UNACCEPT_PARAMSif the MTU is lowers than socket omtu.[...]
Here is the summary with links:
- [v3] Bluetooth: L2CAP: Fix not checking output MTU is acceptable on L2CAP_ECRED_CONN_REQ
https://git.kernel.org/bluetooth/bluetooth-next/c/6a4f124c550d
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html