Skip to content

Commit 8f993d3

Browse files
committed
usb: gadget: f_ncm: validate minimum block_len in ncm_unwrap_ntb()
The block_len read from the host-supplied NTB header is checked against ntb_max but has no lower bound. When block_len is smaller than opts->ndp_size, the bounds check of: ndp_index > (block_len - opts->ndp_size) will underflow producing a huge unsigned value that ndp_index can never exceed, defeating the check entirely. The same underflow occurs in the datagram index checks against block_len - opts->dpe_size. With those checks neutered, a malicious USB host can choose ndp_index and datagram offsets that point past the actual transfer, and the skb_put_data() copies adjacent kernel memory into the network skb. Fix this by rejecting block lengths that cannot hold at least the NTB header plus one NDP. This will make block_len - opts->ndp_size and block_len - opts->dpe_size both well-defined. Commit 8d2b1a1 ("CDC-NCM: avoid overflow in sanity checking") fixed a related class of issues on the host side of NCM. Fixes: 2b74b0a ("USB: gadget: f_ncm: add bounds checks to ncm_unwrap_ntb()") Cc: stable <stable@kernel.org> Assisted-by: gregkh_clanker_t1000 Link: https://patch.msgid.link/2026040753-baffle-handheld-624d@gregkh Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c088d5d commit 8f993d3

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/usb/gadget/function/f_ncm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,8 +1210,8 @@ static int ncm_unwrap_ntb(struct gether *port,
12101210

12111211
block_len = get_ncm(&tmp, opts->block_length);
12121212
/* (d)wBlockLength */
1213-
if (block_len > ntb_max) {
1214-
INFO(port->func.config->cdev, "OUT size exceeded\n");
1213+
if ((block_len < opts->nth_size + opts->ndp_size) || (block_len > ntb_max)) {
1214+
INFO(port->func.config->cdev, "Bad block length: %#X\n", block_len);
12151215
goto err;
12161216
}
12171217

0 commit comments

Comments
 (0)