Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 349863B7B69; Mon, 23 Mar 2026 15:21:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774279266; cv=none; b=Ny5RrwHg5K2Ru3mvfgb1vYOQWr4BeOQ9R0ATi7m+aU6VM8cKJKJpM+PybBNzcjUi0RvA1O/CXpxzX1MthzacErA5lM7+yhU9WIZWBLaD6YbvbTwHBS1paY3n+bGJd91cXnOOre6bCS5oPK5jR9QmNwiIME1x87NqWWZRGVUsVBE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774279266; c=relaxed/simple; bh=cPe7aiYz+DMMYGmYh5NuQNtgawNNgQXpCTMKjDP8/pU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JBkYcAFbSGeOyCaIqh1arIHUO7cqxpP7zYoS6KOdV3baNOXCSg9zEYRZIFdJdb7mVzEGeydBSSSguL9rxxGY4ki/KF/x1PINgzZzt+dl754YixUo4tmnZdb3vd+NDxO82ougdYE6hoVOfEuzJd2FvCUUR6sf6MNJEwGLAdGxh0A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=kNobXHwU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="kNobXHwU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9ED8BC4CEF7; Mon, 23 Mar 2026 15:21:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774279266; bh=cPe7aiYz+DMMYGmYh5NuQNtgawNNgQXpCTMKjDP8/pU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kNobXHwUpimh3vvWHQbr3oeJLiVSZl6CVhiI5nqEpeJ5ndnCJUuA/1II0sNGLbM5r 7JEGttKFxf641YQOuaBmnD/kkDozKW5cGHdkaWEGv3mRZlZNVi1TuP8vIHs5MNzOOg gip1IdL7NqhqvY+TDRMiExiYVkbV5bHiK3yVjFtE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Tobi Gaertner , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 529/567] net: usb: cdc_ncm: add ndpoffset to NDP32 nframes bounds check Date: Mon, 23 Mar 2026 14:47:29 +0100 Message-ID: <20260323134547.084529158@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134533.749096647@linuxfoundation.org> References: <20260323134533.749096647@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tobi Gaertner [ Upstream commit 77914255155e68a20aa41175edeecf8121dac391 ] 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 Link: https://patch.msgid.link/20260314054640.2895026-3-tob.gaertner@me.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/usb/cdc_ncm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index ae7a2829fe49d..56dfd4cd2aa4f 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1693,6 +1693,7 @@ int cdc_ncm_rx_verify_ndp32(struct sk_buff *skb_in, int ndpoffset) struct usbnet *dev = netdev_priv(skb_in->dev); struct usb_cdc_ncm_ndp32 *ndp32; int ret = -EINVAL; + size_t ndp_len; if ((ndpoffset + sizeof(struct usb_cdc_ncm_ndp32)) > skb_in->len) { netif_dbg(dev, rx_err, dev->net, "invalid NDP offset <%u>\n", @@ -1712,8 +1713,8 @@ int cdc_ncm_rx_verify_ndp32(struct sk_buff *skb_in, int ndpoffset) sizeof(struct usb_cdc_ncm_dpe32)); ret--; /* we process NDP entries except for the last one */ - if ((sizeof(struct usb_cdc_ncm_ndp32) + - ret * (sizeof(struct usb_cdc_ncm_dpe32))) > skb_in->len) { + ndp_len = struct_size_t(struct usb_cdc_ncm_ndp32, dpe32, ret); + if (ndpoffset + ndp_len > skb_in->len) { netif_dbg(dev, rx_err, dev->net, "Invalid nframes = %d\n", ret); ret = -EINVAL; } -- 2.51.0