Bluetooth: L2CAP: handle zero txwin_size in ERTM RFC option
Subsystems (3)
PATCH 1/1 Bluetooth: L2CAP: handle zero txwin_size in ERTM RFC option
Bluetooth L2CAP ERTM configuration (RFC option, type 0x04) carries an unsigned 8-bit txwin_size field. Core Spec v5.3, Vol 3 Part A, section 5.4 specifies a valid range of 1..63 (or 1..0x3fff under the Extended Window Size extension). A peer-supplied value of zero is out of spec but the current l2cap_parse_conf_req() path stores it into chan->remote_tx_win unchanged whenever CONF_EWS_RECV is not set.
The zero then reaches l2cap_seq_list_init(size = 0), which computes alloc_size = roundup_pow_of_two(size). Per include/linux/log2.h the result is undefined for size == 0. The runtime behaviour is architecture-dependent:
* x86, arm64, RISC-V, MIPS, s390x, LoongArch: the ISA shift instruction masks the shift count by (word_bits - 1), so 1UL << word_bits evaluates to 1 rather than 0. kmalloc_array(1, sizeof(u16)) returns a valid 2-byte slab allocation with seq_list->mask == 0. ERTM retransmission silently collapses every reqseq onto slot 0 (correctness bug, no memory corruption).
* ARMv7 (AArch32), PowerPC 32-bit (slw), PowerPC 64-bit (sld):
the shift instruction returns 0 for shift counts >= word width. 1UL << word_bits therefore evaluates to 0, kmalloc_array(0, sizeof(u16)) returns ZERO_SIZE_PTR, and seq_list->mask becomes ULONG_MAX. Any subsequent access to seq_list->list dereferences ZERO_SIZE_PTR (0x10), which is always an unmapped low-memory address, and the kernel Oopses. This is a remote kernel panic driven by a single peer-sent CONFIG_REQ; it is not a demonstrated code-execution primitive.
Verified on qemu-system-arm -M virt -cpu cortex-a15 (ARMv7-A, same LSL register-shift semantics as the Cortex-A9 class still shipping in automotive infotainment on NXP i.MX6 with long-term availability through 2028). A KASAN-inline kernel built from mainline panics in l2cap_seq_list_init on the first peer CONFIG_REQ carrying mode = L2CAP_MODE_ERTM and txwin_size = 0:
Unable to handle kernel paging request at virtual address 9f000002 when read Internal error: Oops: 5 [#1] SMP ARM PC is at l2cap_seq_list_init+0x140/0x28c r2 : 00000010 r1 : ffffffff Register r2 information: zero-size pointer Mode SVC_32 ISA ARM Call trace: l2cap_seq_list_init from l2cap_ertm_init+0x588/0x758 l2cap_ertm_init from l2cap_config_rsp+0xeac/0x1158 l2cap_config_rsp from l2cap_recv_frame+0x1260/0x8000 l2cap_recv_frame from l2cap_recv_acldata+0xb78/0xdb0 l2cap_recv_acldata from hci_rx_work
r2 = 0x10 is ZERO_SIZE_PTR (the kernel's own decoder annotates it as such). r1 = 0xFFFFFFFF is seq_list->mask after the 0 - 1 underflow. Faulting address 0x9f000002 is the KASAN shadow for pointer 0x10 (shadow_offset 0x9f000000 + (0x10 >> 3)).
Trigger is one peer-supplied CONFIG_REQ on an L2CAP ERTM channel; no local privileges required, no pairing required, no local interaction beyond being within BR/EDR radio range of an affected host.
Fix in two places:
* l2cap_parse_conf_req(): when the peer sends txwin_size = 0 in the RFC option, clamp it up to L2CAP_DEFAULT_TX_WINDOW before the chan->remote_tx_win assignment. This matches the existing clamp on the CONF_EWS_RECV branch in the same function and mirrors the shape of commit 25f420a0d4cf ("Bluetooth: L2CAP:
Fix ERTM re-init and zero pdu_len infinite loop") for the sibling RFC max_pdu_size field. This is the primary fix: it prevents zero from ever reaching l2cap_seq_list_init() on the normal config path.
* l2cap_seq_list_init(): return -EINVAL on size == 0 as a defence-in-depth check for any current or future caller that might pass an unclamped value. The existing error-propagation in l2cap_ertm_init() and its callers already tears the channel down on error, so the peer simply loses the ERTM channel rather than silently corrupting an unmapped ZERO_SIZE_PTR allocation.
Related but distinct from commit 25f420a0d4cf ("Bluetooth: L2CAP:
Fix ERTM re-init and zero pdu_len infinite loop") which addressed the sibling zero-value issue on the RFC max_pdu_size field.
--- net/bluetooth/l2cap_core.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
net/bluetooth/l2cap_core.c +22 -0
@@ -323,6 +323,17 @@ static int l2cap_seq_list_init(struct l2cap_seq_list *seq_list, u16 size) {size_t alloc_size, i; +/* +* A peer may send an ERTM RFC option with txwin_size = 0, which +* propagates here as size = 0. roundup_pow_of_two(0) is +* documented UB (see include/linux/log2.h) and produces a +* semantically broken seq_list that silently drops every +* retransmission slot. Reject size = 0 explicitly so the caller +* (l2cap_ertm_init) tears the channel down cleanly instead. +*/ +if (!size) +return -EINVAL ; +/* Allocated size is a power of 2 to map sequence numbers * (which may be up to 14 bits) in to a smaller array that is * sized for the negotiated ERTM transmit windows.
@@ -3593,6 +3604,17 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t databreak ;case L2CAP_MODE_ERTM : +/* +* Peer-supplied RFC txwin_size = 0 is out of spec +* (Core Spec v5.3 Vol 3 Part A 5.4: ERTM tx window +* range is 1..63, or 1..0x3fff with EWS). Clamp up +* to the default window so the subsequent +* l2cap_seq_list_init(remote_tx_win) does not +* receive a zero size. +*/ +if (!rfc.txwin_size) + rfc.txwin_size =L2CAP_DEFAULT_TX_WINDOW ; +if (!test_bit (CONF_EWS_RECV , &chan->conf_state)) chan->remote_tx_win = rfc.txwin_size;else
--
2.53.0
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=1082694
---Test result---
Test Summary:
CheckPatch FAIL 0.78 seconds GitLint PASS 0.38 seconds SubjectPrefix PASS 0.13 seconds BuildKernel PASS 25.65 seconds CheckAllWarning PASS 28.56 seconds CheckSparse PASS 26.63 seconds BuildKernel32 PASS 25.01 seconds TestRunnerSetup PASS 526.98 seconds TestRunner_l2cap-tester PASS 28.12 seconds IncrementalBuild PASS 24.83 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
Bluetooth: L2CAP: handle zero txwin_size in ERTM RFC option
WARNING: Non-standard signature: Assisted-by:
#191:
ERROR: Unrecognized email address: 'Claude:claude-opus-4-7' #191:
total: 1 errors, 1 warnings, 0 checks, 34 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/patch/14528993.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
https://github.com/bluez/bluetooth-next/pull/100
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerHi Michael,
Quoted 135 lines · Michael Bommarito
Bluetooth L2CAP ERTM configuration (RFC option, type
0x04) carries an unsigned 8-bittxwin_sizefield. Core Spec v5.3, Vol 3 Part A, section 5.4 specifies a valid range of 1..63 (or 1..0x3fff under the Extended Window Size extension). A peer-supplied value of zero is out of spec but the currentl2cap_parse_conf_req()path stores it intochan->remote_tx_winunchanged wheneverCONF_EWS_RECVis not set.The zero then reaches
l2cap_seq_list_init(size = 0), which computesalloc_size=roundup_pow_of_two(size). Perinclude/linux/log2.hthe result is undefined for size == 0. The runtime behaviour is architecture-dependent:* x86, arm64, RISC-V, MIPS, s390x, LoongArch: the ISA shift instruction masks the shift count by (
word_bits- 1), so 1UL <<word_bitsevaluates to 1 rather than 0.kmalloc_array(1, sizeof(u16))returns a valid 2-byte slab allocation withseq_list->mask== 0. ERTM retransmission silently collapses every reqseq onto slot 0 (correctness bug, no memory corruption).* ARMv7 (AArch32), PowerPC 32-bit (slw), PowerPC 64-bit (sld):
the shift instruction returns 0 for shift counts >= word width. 1UL <<word_bitstherefore evaluates to 0,kmalloc_array(0, sizeof(u16))returnsZERO_SIZE_PTR, andseq_list->maskbecomesULONG_MAX. Any subsequent access toseq_list->listdereferencesZERO_SIZE_PTR(0x10), which is always an unmapped low-memory address, and the kernel Oopses. This is a remote kernel panic driven by a single peer-sentCONFIG_REQ; it is not a demonstrated code-execution primitive.Verified on qemu-system-arm -M virt -cpu cortex-a15 (ARMv7-A, same LSL register-shift semantics as the Cortex-A9 class still shipping in automotive infotainment on NXP i.MX6 with long-term availability through 2028). A KASAN-inline kernel built from mainline panics in
l2cap_seq_list_initon the first peerCONFIG_REQcarrying mode =L2CAP_MODE_ERTMandtxwin_size= 0:Unable to handle kernel paging request at virtual address 9f000002 when read Internal error: Oops: 5 [#1] SMP ARM PC is at l2cap_seq_list_init+0x140/0x28c r2 : 00000010 r1 : ffffffff Register r2 information: zero-size pointer Mode SVC_32 ISA ARM Call trace: l2cap_seq_list_init from l2cap_ertm_init+0x588/0x758 l2cap_ertm_init from l2cap_config_rsp+0xeac/0x1158 l2cap_config_rsp from l2cap_recv_frame+0x1260/0x8000 l2cap_recv_frame from l2cap_recv_acldata+0xb78/0xdb0 l2cap_recv_acldata from hci_rx_workr2 =
0x10isZERO_SIZE_PTR(the kernel's own decoder annotates it as such). r1 =0xFFFFFFFFisseq_list->maskafter the 0 - 1 underflow. Faulting address0x9f000002is the KASAN shadow for pointer0x10(shadow_offset0x9f000000+ (0x10>> 3)).Trigger is one peer-supplied
CONFIG_REQon an L2CAP ERTM channel; no local privileges required, no pairing required, no local interaction beyond being within BR/EDR radio range of an affected host.Fix in two places:
*
l2cap_parse_conf_req(): when the peer sendstxwin_size= 0 in the RFC option, clamp it up toL2CAP_DEFAULT_TX_WINDOWbefore thechan->remote_tx_winassignment. This matches the existing clamp on theCONF_EWS_RECVbranch in the same function and mirrors the shape of commit25f420a0d4cf("Bluetooth: L2CAP:
Fix ERTM re-init and zeropdu_leninfinite loop") for the sibling RFCmax_pdu_sizefield. This is the primary fix: it prevents zero from ever reachingl2cap_seq_list_init()on the normal config path.*
l2cap_seq_list_init(): return-EINVALon size == 0 as a defence-in-depth check for any current or future caller that might pass an unclamped value. The existing error-propagation inl2cap_ertm_init()and its callers already tears the channel down on error, so the peer simply loses the ERTM channel rather than silently corrupting an unmappedZERO_SIZE_PTRallocation.Related but distinct from commit
25f420a0d4cf("Bluetooth: L2CAP:
Fix ERTM re-init and zeropdu_leninfinite loop") which addressed the sibling zero-value issue on the RFCmax_pdu_sizefield.Fixes 3c588192b5e5 ("Bluetooth: Add the l2cap_seq_list structure for tracking frames")Signed-off-by Michael Bommarito <[email protected]>Assisted-by Claude:claude-opus-4-7--- net/bluetooth/l2cap_core.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)net/bluetooth/l2cap_core.c +22
-1@@ -323,6 +323,17 @@ static int l2cap_seq_list_init(struct l2cap_seq_list *seq_list, u16 size) {size_t alloc_size, i; +/* +* A peer may send an ERTM RFC option with txwin_size = 0, which +* propagates here as size = 0. roundup_pow_of_two(0) is +* documented UB (see include/linux/log2.h) and produces a +* semantically broken seq_list that silently drops every +* retransmission slot. Reject size = 0 explicitly so the caller +* (l2cap_ertm_init) tears the channel down cleanly instead. +*/ +if (!size) +return -EINVAL ; +/* Allocated size is a power of 2 to map sequence numbers * (which may be up to 14 bits) in to a smaller array that is * sized for the negotiated ERTM transmit windows. @@ -3593,6 +3604,17 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t databreak ;case L2CAP_MODE_ERTM : +/* +* Peer-supplied RFC txwin_size = 0 is out of spec +* (Core Spec v5.3 Vol 3 Part A 5.4: ERTM tx window +* range is 1..63, or 1..0x3fff with EWS). Clamp up +* to the default window so the subsequent +* l2cap_seq_list_init(remote_tx_win) does not +* receive a zero size. +*/ +if (!rfc.txwin_size) + rfc.txwin_size =L2CAP_DEFAULT_TX_WINDOW ; +if (!test_bit (CONF_EWS_RECV , &chan->conf_state)) chan->remote_tx_win = rfc.txwin_size;else --
Quoted 1 line
2.53.0
https://sashiko.dev/#/patchset/20260417221628.1674866-1-michael.bommarito%40gmail.com
We should probably fix the double free if it can occur; perhaps the others should be addressed in different patches.
Signature · 1 line
Luiz Augusto von Dentz
v2 cover Bluetooth: L2CAP: fix zero txwin_size handling and repeated CONFIG_RSP re-init
Hi Luiz,
Thanks for the review.
v1 mixed the original zero-txwin fix with a defensive l2cap_seq_list_init(size == 0) error return. Re-checking that path made it clear the reroll should be split:
1. keep the original report focused on zero txwin_size, but fix it by normalizing zero window values at the actual inputs to the ERTM state machine and by making sequence-list teardown idempotent, rather than by introducing a new init-time failure path
2. handle the separate repeated-CONFIG_RSP ERTM re-init bug in its own patch, matching the BT_CONNECTED guard that commit 25f420a0d4cf already added on the CONFIG_REQ side
While auditing the Sashiko comments, I also checked the claimed CONF_EWS_RECV bypass. I did not carry that theory into v2: in this tree CONF_EWS_RECV is declared but never set, so the concrete zero-window paths are the plain RFC option, the local L2CAP_OPTIONS socket setting, and the CONFIG_RSP / conf_rfc_get negotiation state.
To make sure the reroll covered all the zero-entry sites (and only the zero-entry sites), I enumerated every assignment to tx_win / ack_win / remote_tx_win / txwin_size in net/bluetooth/l2cap_core.c and confirmed patch 1 normalizes the four reachable input paths -- the local L2CAP_OPTIONS setsockopt, l2cap_txwin_setup() on the outgoing RFC, the L2CAP_MODE_ERTM branch of l2cap_parse_conf_req(), and the EWS / RFC branches of l2cap_parse_conf_rsp() and l2cap_conf_rfc_get(). The only other writers are the channel-create defaults in l2cap_chan_create() (hard-coded to L2CAP_DEFAULT_TX_WINDOW) and the outgoing rfc.txwin_size = 0 assignments in L2CAP_MODE_BASIC / L2CAP_MODE_STREAMING branches, where a zero is spec-correct and never feeds ack_win.
l2cap_seq_list_free()'s callers are l2cap_chan_del() (channel teardown) and l2cap_ertm_init()'s error path; clearing the list metadata after kfree() is safe for both and is what makes the partially-initialized re-entry in the failure path no longer a double-free source.
For patch 2, the BT_CONNECTED guard added to l2cap_config_rsp() mirrors the existing one in l2cap_config_req() (lines 4339..4348 in this tree) so both sides of the CONFIG exchange now refuse to re-enter l2cap_ertm_init() once the channel is already connected. I did not pin down a single introducing commit for the CONFIG_RSP side during this pass, so patch 2 keeps Cc: stable@ without a speculative Fixes:
tag; happy to add one if you'd prefer a specific reference.
Changes since v1
----------------
- Split the reroll into two patches: the zero-txwin fix and the separate repeated-CONFIG_RSP ERTM re-init fix.
- Dropped the v1 l2cap_seq_list_init(size == 0) -> -EINVAL defence and instead normalize zero tx window values where they enter negotiated ERTM state.
- Clamp the local L2CAP_OPTIONS txwin_size = 0 case back to L2CAP_DEFAULT_TX_WINDOW.
- Normalize zero tx window values seen during CONFIG_RSP / RFC parsing so ack_win does not collapse to 0.
- Make l2cap_seq_list_free() clear list metadata after kfree so later teardown cannot trip over a previously freed list.
Michael Bommarito (2):
Bluetooth: L2CAP: handle zero txwin_size in ERTM RFC option
Bluetooth: L2CAP: skip ERTM re-init on repeated CONFIG_RSP
net/bluetooth/l2cap_core.c | 39 +++++++++++++++++++++++++++----------- net/bluetooth/l2cap_sock.c | 3 +++ 2 files changed, 31 insertions(+), 11 deletions(-)
Signature · 1 line
2.53.0
PATCH v2 1/2 Bluetooth: L2CAP: handle zero txwin_size in ERTM RFC option
In reply to Luiz Augusto von DentzPeer-supplied ERTM RFC txwin_size = 0 can still propagate into the ERTM transmit-window state, and the same invalid value can be introduced locally through L2CAP_OPTIONS. In the request path that zero reaches l2cap_seq_list_init(..., 0); in the response path it can shrink ack_win to 0 and leave ERTM sequencing in a nonsensical state.
Normalize zero tx window values back to L2CAP_DEFAULT_TX_WINDOW wherever they enter the ERTM state machine: local socket options, outgoing tx_win setup, incoming config requests, and config-response parsing. Also make l2cap_seq_list_free() clear its metadata after kfree so an init failure after freeing srej_list cannot be freed a second time during later channel teardown.
---
Changes in v2:
- drop the v1 l2cap_seq_list_init(size == 0) -> -EINVAL approach and instead normalize zero tx window values at the socket / request / response inputs
- clamp the local L2CAP_OPTIONS txwin_size = 0 case back to L2CAP_DEFAULT_TX_WINDOW
- make l2cap_seq_list_free() clear its metadata after kfree() so later teardown cannot trip over a previously freed list
- split the repeated CONFIG_RSP ERTM re-init fix into patch 2
net/bluetooth/l2cap_core.c | 23 +++++++++++++++++++---- net/bluetooth/l2cap_sock.c | 3 +++ 2 files changed, 22 insertions(+), 4 deletions(-)
net/bluetooth/l2cap_core.c +19 -4
@@ -345,6 +345,10 @@ static int l2cap_seq_list_init(struct l2cap_seq_list *seq_list, u16 size)static inline void l2cap_seq_list_free (struct l2cap_seq_list *seq_list) {kfree (seq_list->list); + seq_list->list =NULL ; + seq_list->mask =0 ; + seq_list->head =L2CAP_SEQ_LIST_CLEAR ; + seq_list->tail =L2CAP_SEQ_LIST_CLEAR ; } static inline bool l2cap_seq_list_contains(struct l2cap_seq_list *seq_list,
@@ -3234,8 +3238,15 @@ static void __l2cap_set_ertm_timeouts(struct l2cap_chan *chan, rfc->monitor_timeout =cpu_to_le16 (L2CAP_DEFAULT_MONITOR_TO ); } +static inline u16 l2cap_txwin_default (u16 txwin) +{ +return txwin ? txwin :L2CAP_DEFAULT_TX_WINDOW ; +} +static inline void l2cap_txwin_setup (struct l2cap_chan *chan) { + chan->tx_win =l2cap_txwin_default (chan->tx_win); +if (chan->tx_win >L2CAP_DEFAULT_TX_WINDOW &&__l2cap_ews_supported (chan->conn)) {/* use extended control field */
@@ -3593,6 +3604,8 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t databreak ;case L2CAP_MODE_ERTM : + rfc.txwin_size =l2cap_txwin_default (rfc.txwin_size); +if (!test_bit (CONF_EWS_RECV , &chan->conf_state)) chan->remote_tx_win = rfc.txwin_size;else
@@ -3715,7 +3728,8 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,case L2CAP_CONF_EWS :if (olen !=2 )break ; - chan->ack_win =min_t (u16, val, chan->ack_win); + chan->ack_win =min_t (u16,l2cap_txwin_default (val), + chan->ack_win);l2cap_add_conf_opt (&ptr,L2CAP_CONF_EWS ,2 , chan->tx_win, endptr - ptr);break ;
@@ -3756,7 +3770,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, chan->mps =le16_to_cpu (rfc.max_pdu_size);if (!test_bit (FLAG_EXT_CTRL , &chan->flags)) chan->ack_win =min_t (u16, chan->ack_win, - rfc.txwin_size); +l2cap_txwin_default (rfc.txwin_size));if (test_bit (FLAG_EFS_ENABLE , &chan->flags)) { chan->local_msdu =le16_to_cpu (efs.msdu);
@@ -3970,10 +3984,11 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len) chan->monitor_timeout =le16_to_cpu (rfc.monitor_timeout); chan->mps =le16_to_cpu (rfc.max_pdu_size);if (test_bit (FLAG_EXT_CTRL , &chan->flags)) - chan->ack_win =min_t (u16, chan->ack_win, txwin_ext); + chan->ack_win =min_t (u16, chan->ack_win, +l2cap_txwin_default (txwin_ext));else chan->ack_win =min_t (u16, chan->ack_win, - rfc.txwin_size); +l2cap_txwin_default (rfc.txwin_size));break ;case L2CAP_MODE_STREAMING : chan->mps =le16_to_cpu (rfc.max_pdu_size);
net/bluetooth/l2cap_sock.c +3 -0
@@ -765,6 +765,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,break ; } +if (!opts.txwin_size) + opts.txwin_size =L2CAP_DEFAULT_TX_WINDOW ; +if (!l2cap_valid_mtu (chan, opts.imtu)) { err = -EINVAL ;break ;
Signature · 1 line
2.53.0
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=1083882
---Test result---
Test Summary:
CheckPatch FAIL 1.20 seconds GitLint PASS 0.45 seconds SubjectPrefix PASS 0.17 seconds BuildKernel PASS 20.51 seconds CheckAllWarning PASS 21.04 seconds CheckSparse PASS 23.68 seconds BuildKernel32 PASS 18.71 seconds TestRunnerSetup PASS 403.79 seconds TestRunner_l2cap-tester PASS 23.06 seconds IncrementalBuild PASS 21.36 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[v2,1/2] Bluetooth: L2CAP: handle zero txwin_size in ERTM RFC option
WARNING: Non-standard signature: Assisted-by:
#125:
ERROR: Unrecognized email address: 'Claude:claude-opus-4-7' #125:
total: 1 errors, 1 warnings, 0 checks, 72 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/patch/14532642.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[v2,2/2] Bluetooth: L2CAP: skip ERTM re-init on repeated CONFIG_RSP
WARNING: Non-standard signature: Assisted-by:
#124:
ERROR: Unrecognized email address: 'Claude:claude-opus-4-7' #124:
WARNING: The commit message has 'stable@', perhaps it also needs a 'Fixes:' tag?
total: 1 errors, 2 warnings, 0 checks, 23 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/patch/14532643.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
https://github.com/bluez/bluetooth-next/pull/111
---
Regards,
Linux Bluetooth
Luiz Augusto von Dentz
maintainerHi Michael,
Quoted 121 lines · Michael Bommarito
Peer-supplied ERTM RFC
txwin_size= 0 can still propagate into the ERTM transmit-window state, and the same invalid value can be introduced locally throughL2CAP_OPTIONS. In the request path that zero reachesl2cap_seq_list_init(..., 0); in the response path it can shrinkack_winto 0 and leave ERTM sequencing in a nonsensical state.Normalize zero tx window values back to
L2CAP_DEFAULT_TX_WINDOWwherever they enter the ERTM state machine: local socket options, outgoingtx_winsetup, incoming config requests, and config-response parsing. Also makel2cap_seq_list_free()clear its metadata after kfree so an init failure after freeingsrej_listcannot be freed a second time during later channel teardown.Fixes 3c588192b5e5 ("Bluetooth: Add the l2cap_seq_list structure for tracking frames")Signed-off-by Michael Bommarito <[email protected]>Assisted-by Claude:claude-opus-4-7---
Changes in v2:
- drop the v1l2cap_seq_list_init(size == 0) -> -EINVALapproach and instead normalize zero tx window values at the socket / request / response inputs
- clamp the localL2CAP_OPTIONStxwin_size= 0 case back toL2CAP_DEFAULT_TX_WINDOW
- makel2cap_seq_list_free()clear its metadata afterkfree()so later teardown cannot trip over a previously freed list
- split the repeatedCONFIG_RSPERTM re-init fix into patch 2net/bluetooth/l2cap_core.c | 23 +++++++++++++++++++---- net/bluetooth/l2cap_sock.c | 3 +++ 2 files changed, 22 insertions(+), 4 deletions(-)net/bluetooth/l2cap_core.c +19
-4@@ -345,6 +345,10 @@ static int l2cap_seq_list_init(struct l2cap_seq_list *seq_list, u16 size)static inline void l2cap_seq_list_free (struct l2cap_seq_list *seq_list) {kfree (seq_list->list); + seq_list->list =NULL ; + seq_list->mask =0 ; + seq_list->head =L2CAP_SEQ_LIST_CLEAR ; + seq_list->tail =L2CAP_SEQ_LIST_CLEAR ; } static inline bool l2cap_seq_list_contains(struct l2cap_seq_list *seq_list,@@ -3234,8 +3238,15 @@ static void __l2cap_set_ertm_timeouts(struct l2cap_chan *chan, rfc->monitor_timeout =cpu_to_le16 (L2CAP_DEFAULT_MONITOR_TO ); } +static inline u16 l2cap_txwin_default (u16 txwin) +{ +return txwin ? txwin :L2CAP_DEFAULT_TX_WINDOW ; +} +static inline void l2cap_txwin_setup (struct l2cap_chan *chan) { + chan->tx_win =l2cap_txwin_default (chan->tx_win); +if (chan->tx_win >L2CAP_DEFAULT_TX_WINDOW &&__l2cap_ews_supported (chan->conn)) {/* use extended control field */ @@ -3593,6 +3604,8 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t databreak ;case L2CAP_MODE_ERTM : + rfc.txwin_size =l2cap_txwin_default (rfc.txwin_size); +if (!test_bit (CONF_EWS_RECV , &chan->conf_state)) chan->remote_tx_win = rfc.txwin_size;else @@ -3715,7 +3728,8 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,case L2CAP_CONF_EWS :if (olen !=2 )break ; - chan->ack_win =min_t (u16, val, chan->ack_win); + chan->ack_win =min_t (u16,l2cap_txwin_default (val), + chan->ack_win);l2cap_add_conf_opt (&ptr,L2CAP_CONF_EWS ,2 , chan->tx_win, endptr - ptr);break ;@@ -3756,7 +3770,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, chan->mps =le16_to_cpu (rfc.max_pdu_size);if (!test_bit (FLAG_EXT_CTRL , &chan->flags)) chan->ack_win =min_t (u16, chan->ack_win, - rfc.txwin_size); +l2cap_txwin_default (rfc.txwin_size));if (test_bit (FLAG_EFS_ENABLE , &chan->flags)) { chan->local_msdu =le16_to_cpu (efs.msdu);@@ -3970,10 +3984,11 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len) chan->monitor_timeout =le16_to_cpu (rfc.monitor_timeout); chan->mps =le16_to_cpu (rfc.max_pdu_size);if (test_bit (FLAG_EXT_CTRL , &chan->flags)) - chan->ack_win =min_t (u16, chan->ack_win, txwin_ext); + chan->ack_win =min_t (u16, chan->ack_win, +l2cap_txwin_default (txwin_ext));else chan->ack_win =min_t (u16, chan->ack_win, - rfc.txwin_size); +l2cap_txwin_default (rfc.txwin_size));break ;case L2CAP_MODE_STREAMING : chan->mps =le16_to_cpu (rfc.max_pdu_size);net/bluetooth/l2cap_sock.c +3
-1@@ -765,6 +765,9 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,break ; } +if (!opts.txwin_size) + opts.txwin_size =L2CAP_DEFAULT_TX_WINDOW ; +if (!l2cap_valid_mtu (chan, opts.imtu)) { err = -EINVAL ;break ; --
Quoted 1 line
2.53.0
This seems to be going sideways:
Patch 2/2 seems totally broken.
Signature · 1 line
Luiz Augusto von Dentz
Quoted 5 lines · Luiz Augusto von Dentz
This seems to be going sideways:
Patch 2/2 seems totally broken.
Yeah, not a great turn. I am struggling to figure out where to move some of these parts and where to put the guards without touching too much. As Sashiko pointed out, there are some preexisting bugs or spec questions that I don't feel like I should be touching unless we expand this to more of a cleanup + hardening patch set.
If we break this down, there are now ~5 different issues in adjacent/connected spots:
Ones I was trying to hit or introduced:
1. Zero txwin_size in inbound CONFIG_REQ (ERTM RFC) - original bug. Need to balance normalization with spec.
2. Repeated CONFIG_RSP re-running l2cap_ertm_init in BT_CONNECTED - original v2 2/2 target. We need the guard somewhere safe under the state model.
3. Zero txwin_size from userspace setsockopt - original v2 1/2 hunk in l2cap_sock.c.
Pre-existing issues:
3. STREAMING -> ERTM mode switch via late CONF_RSP - pre-existing.
4. l2cap_sock_setsockopt_old locking - pre-existing.
It feels like the safe solution is probably going to be at least +100 or 200 by the time it's done and more than just a hardening patch. I can take a spin at it, but I will probably be slower and more bug-prone than someone else. No pride of ownership here. Just let me know if you want to take the fix over or let me try again
Thanks,
MIke Bommarito
Luiz Augusto von Dentz
maintainerHi Michael,
Quoted 31 lines · Michael Bommarito
Quoted 5 lines · Luiz Augusto von Dentz
This seems to be going sideways:
Patch 2/2 seems totally broken.
Yeah, not a great turn. I am struggling to figure out where to move some of these parts and where to put the guards without touching too much. As Sashiko pointed out, there are some preexisting bugs or spec questions that I don't feel like I should be touching unless we expand this to more of a cleanup + hardening patch set.
If we break this down, there are now ~5 different issues in adjacent/connected spots:
Ones I was trying to hit or introduced:
1. Zerotxwin_sizein inboundCONFIG_REQ(ERTM RFC) - original bug. Need to balance normalization with spec.
2. RepeatedCONFIG_RSPre-runningl2cap_ertm_initinBT_CONNECTED- original v2 2/2 target. We need the guard somewhere safe under the state model.
3. Zerotxwin_sizefrom userspace setsockopt - original v2 1/2 hunk inl2cap_sock.c.Pre-existing issues:
3. STREAMING -> ERTM mode switch via lateCONF_RSP- pre-existing.
4.l2cap_sock_setsockopt_oldlocking - pre-existing.
Quoted 5 lines
It feels like the safe solution is probably going to be at least +100 or 200 by the time it's done and more than just a hardening patch. I can take a spin at it, but I will probably be slower and more bug-prone than someone else. No pride of ownership here. Just let me know if you want to take the fix over or let me try again
100-200 is not too bad though, if there are splits in, let's say, 5 changes that seem doable, especially now that we can sashiko review it and point out if we are missing something. Another approach would be to leave the pre-existing issues to be fixed in a separate set.
Quoted 2 lines
Thanks,
MIke Bommarito
Signature · 1 line
Luiz Augusto von Dentz
Quoted 4 lines · Luiz Augusto von Dentz
100-200 is not too bad though, if there are splits in, let's say, 5 changes that seem doable, especially now that we can sashiko review it and point out if we are missing something. Another approach would be to leave the pre-existing issues to be fixed in a separate set.
OK, if you're down with a bigger blast radius, I'll go through and put together a bigger patch set so we just fix it instead of deferring.
Might be a few days, I need to block out more time to diagram the state model and conditions here given my lack of familiarity. Thanks for your patience
Thanks,
Mike Bommarito
PATCH v2 2/2 Bluetooth: L2CAP: skip ERTM re-init on repeated CONFIG_RSP
In reply to Luiz Augusto von Dentzcommit 25f420a0d4cf ("Bluetooth: L2CAP: Fix ERTM re-init and zero pdu_len infinite loop") taught l2cap_config_req() not to call l2cap_ertm_init() again once the channel is already in BT_CONNECTED.
l2cap_config_rsp() still lacks the same guard. After the initial ERTM setup, any extra successful CONFIG_RSP re-enters l2cap_ertm_init(), reinitializes tx_q and srej_q, and allocates fresh sequence lists over the existing channel state.
Mirror the existing BT_CONNECTED check in l2cap_config_rsp() so response parsing can still update negotiated parameters without reinitializing ERTM state or leaking the old resources.
---
Changes in v2:
- split out of the original zero-txwin patch so the repeated CONFIG_RSP ERTM re-init bug is reviewed as a distinct issue
- mirror the existing BT_CONNECTED guard already present on the CONFIG_REQ side after commit 25f420a0d4cf
net/bluetooth/l2cap_core.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
net/bluetooth/l2cap_core.c +9 -7
@@ -4480,14 +4480,16 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn,if (test_bit (CONF_OUTPUT_DONE , &chan->conf_state)) {set_default_fcs (chan); -if (chan->mode ==L2CAP_MODE_ERTM || - chan->mode ==L2CAP_MODE_STREAMING ) - err =l2cap_ertm_init (chan); +if (chan->state !=BT_CONNECTED ) { +if (chan->mode ==L2CAP_MODE_ERTM || + chan->mode ==L2CAP_MODE_STREAMING ) + err =l2cap_ertm_init (chan); -if (err <0 ) -l2cap_send_disconn_req (chan, -err); -else -l2cap_chan_ready (chan); +if (err <0 ) +l2cap_send_disconn_req (chan, -err); +else +l2cap_chan_ready (chan); + } } done:
Signature · 1 line
2.53.0