* [PATCH] Bluetooth: ISO: validate ISO_END fragments [not found] <CAKvcANPiqdO_Re3+06DWhb7uyKP+gCODJpo35sq5-x62gYJUPw@mail.gmail.com> @ 2026-03-28 20:09 ` Kangzheng Gu 2026-03-30 19:51 ` Luiz Augusto von Dentz 0 siblings, 1 reply; 2+ messages in thread From: Kangzheng Gu @ 2026-03-28 20:09 UTC (permalink / raw) To: gregkh, marcel, luiz.dentz, luiz.von.dentz, xiaoguai0992 Cc: linux-bluetooth, linux-kernel, stable A malformed ISO_END fragment can trigger a NULL pointer dereference due to missing validation before processing. An oversized end fragment should also be rejected. Add the same validation for ISO_END as for ISO_CONT, and reset the in-progress reassembly state when malformed input is detected. Fixes: ccf74f2390d6 ("Bluetooth: Add BTPROTO_ISO socket type") Cc: stable@vger.kernel.org Signed-off-by: Kangzheng Gu <xiaoguai0992@gmail.com> --- net/bluetooth/iso.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c index be145e2736b7..8707f3c4b103 100644 --- a/net/bluetooth/iso.c +++ b/net/bluetooth/iso.c @@ -2587,6 +2587,27 @@ int iso_recv(struct hci_dev *hdev, u16 handle, struct sk_buff *skb, u16 flags) break; case ISO_END: + BT_DBG("End: frag len %d (expecting %d)", skb->len, + conn->rx_len); + + if (!conn->rx_len) { + BT_ERR("Unexpected end frame (len %d)", + skb->len); + kfree_skb(conn->rx_skb); + conn->rx_skb = NULL; + conn->rx_len = 0; + goto drop; + } + + if (skb->len > conn->rx_len) { + BT_ERR("Fragment is too long (len %d, expected %d)", + skb->len, conn->rx_len); + kfree_skb(conn->rx_skb); + conn->rx_skb = NULL; + conn->rx_len = 0; + goto drop; + } + skb_copy_from_linear_data(skb, skb_put(conn->rx_skb, skb->len), skb->len); conn->rx_len -= skb->len; -- 2.50.1 ^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Bluetooth: ISO: validate ISO_END fragments 2026-03-28 20:09 ` [PATCH] Bluetooth: ISO: validate ISO_END fragments Kangzheng Gu @ 2026-03-30 19:51 ` Luiz Augusto von Dentz 0 siblings, 0 replies; 2+ messages in thread From: Luiz Augusto von Dentz @ 2026-03-30 19:51 UTC (permalink / raw) To: Kangzheng Gu Cc: gregkh, marcel, luiz.von.dentz, linux-bluetooth, linux-kernel, stable Hi Kangzheng, On Sat, Mar 28, 2026 at 4:09 PM Kangzheng Gu <xiaoguai0992@gmail.com> wrote: > > A malformed ISO_END fragment can trigger a NULL pointer dereference > due to missing validation before processing. An oversized end fragment > should also be rejected. > > Add the same validation for ISO_END as for ISO_CONT, and reset the > in-progress reassembly state when malformed input is detected. > > Fixes: ccf74f2390d6 ("Bluetooth: Add BTPROTO_ISO socket type") > Cc: stable@vger.kernel.org > Signed-off-by: Kangzheng Gu <xiaoguai0992@gmail.com> > --- > net/bluetooth/iso.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c > index be145e2736b7..8707f3c4b103 100644 > --- a/net/bluetooth/iso.c > +++ b/net/bluetooth/iso.c > @@ -2587,6 +2587,27 @@ int iso_recv(struct hci_dev *hdev, u16 handle, struct sk_buff *skb, u16 flags) > break; > > case ISO_END: > + BT_DBG("End: frag len %d (expecting %d)", skb->len, > + conn->rx_len); > + > + if (!conn->rx_len) { > + BT_ERR("Unexpected end frame (len %d)", > + skb->len); > + kfree_skb(conn->rx_skb); > + conn->rx_skb = NULL; > + conn->rx_len = 0; > + goto drop; > + } I suspect this was not quite right: https://sashiko.dev/#/patchset/20260328200938.140528-1-xiaoguai0992%40gmail.com Have you actually validated this changes against any hardware? > + if (skb->len > conn->rx_len) { > + BT_ERR("Fragment is too long (len %d, expected %d)", > + skb->len, conn->rx_len); > + kfree_skb(conn->rx_skb); > + conn->rx_skb = NULL; > + conn->rx_len = 0; > + goto drop; > + } Hmm, this is the end fragment so anything other than skb->len == conn->rx_len is unexpected. > skb_copy_from_linear_data(skb, skb_put(conn->rx_skb, skb->len), > skb->len); > conn->rx_len -= skb->len; > -- > 2.50.1 > -- Luiz Augusto von Dentz ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-03-30 19:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CAKvcANPiqdO_Re3+06DWhb7uyKP+gCODJpo35sq5-x62gYJUPw@mail.gmail.com>
2026-03-28 20:09 ` [PATCH] Bluetooth: ISO: validate ISO_END fragments Kangzheng Gu
2026-03-30 19:51 ` Luiz Augusto von Dentz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®