From: tobgaertner <tob.gaertner@me.com>
To: netdev@vger.kernel.org
Cc: linux-usb@vger.kernel.org, gregkh@linuxfoundation.org,
oneukum@suse.com, bjorn@mork.no,
tobgaertner <tob.gaertner@me.com>
Subject: [PATCH v2 0/2] net: usb: cdc_ncm: fix NDP nframes bounds check
Date: Mon, 9 Mar 2026 13:34:47 -0700 [thread overview]
Message-ID: <20260309203449.2594858-1-tob.gaertner@me.com> (raw)
The nframes bounds check in cdc_ncm_rx_fixup() validates that the NDP
fits within the skb, but omits ndpoffset from the calculation. This
allows a malicious USB device to place a valid-looking NDP at a large
offset near the end of the skb, where the frame entries extend past the
skb boundary, causing an out-of-bounds read when iterating the NDP
entries.
Fix by including ndpoffset in the size comparison, so the check
correctly verifies that the entire NDP (header + frame entries) starting
at ndpoffset fits within skb->len.
Also use struct_size_t() for the NDP size calculation instead of manual
sizeof() arithmetic, as suggested by review.
Changes since v1:
- Split into two patches with separate Fixes tags for NDP16 and NDP32
- Use struct_size_t() instead of manual sizeof() + count * sizeof()
- Verified fix prevents out-of-bounds read via fuzzer regression test
tobgaertner (2):
net: usb: cdc_ncm: add ndpoffset to NDP16 nframes bounds check
net: usb: cdc_ncm: add ndpoffset to NDP32 nframes bounds check
drivers/net/usb/cdc_ncm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--
2.43.0
next reply other threads:[~2026-03-09 20:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-09 20:34 tobgaertner [this message]
2026-03-09 20:34 ` [PATCH v2 1/2] net: usb: cdc_ncm: add ndpoffset to NDP16 nframes bounds check tobgaertner
2026-03-12 1:53 ` Jakub Kicinski
2026-03-09 20:34 ` [PATCH v2 2/2] net: usb: cdc_ncm: add ndpoffset to NDP32 " tobgaertner
2026-03-12 1:53 ` Jakub Kicinski
2026-03-11 17:17 ` [PATCH v2 0/2] net: usb: cdc_ncm: fix NDP " Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260309203449.2594858-1-tob.gaertner@me.com \
--to=tob.gaertner@me.com \
--cc=bjorn@mork.no \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oneukum@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox