]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commit
net: usb: cdc_ncm: add ndpoffset to NDP32 nframes bounds check
authorTobi Gaertner <tob.gaertner@me.com>
Sat, 14 Mar 2026 05:46:40 +0000 (22:46 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 17 Mar 2026 03:14:48 +0000 (20:14 -0700)
commit77914255155e68a20aa41175edeecf8121dac391
tree9cf3795ce1622db170ef44043cc39ee3de55e13d
parent2aa8a4fa8d5b7d0e1ebcec100e1a4d80a1f4b21a
net: usb: cdc_ncm: add ndpoffset to NDP32 nframes bounds check

The same bounds-check bug fixed for NDP16 in the previous patch also
exists in cdc_ncm_rx_verify_ndp32(). The DPE array size is validated
against the total skb length without accounting for ndpoffset, allowing
out-of-bounds reads when the NDP32 is placed near the end of the NTB.

Add ndpoffset to the nframes bounds check and use struct_size_t() to
express the NDP-plus-DPE-array size more clearly.

Compile-tested only.

Fixes: 0fa81b304a79 ("cdc_ncm: Implement the 32-bit version of NCM Transfer Block")
Signed-off-by: Tobi Gaertner <tob.gaertner@me.com>
Link: https://patch.msgid.link/20260314054640.2895026-3-tob.gaertner@me.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/usb/cdc_ncm.c