public inbox for linux-usb@vger.kernel.org
 help / color / mirror / Atom feed
From: Foster Snowhill <forst@pen.gy>
To: "David S. Miller" <davem@davemloft.net>,
	Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Cc: Georgi Valkov <gvalkov@gmail.com>,
	Simon Horman <horms@kernel.org>, Oliver Neukum <oneukum@suse.com>,
	netdev@vger.kernel.org, linux-usb@vger.kernel.org
Subject: [PATCH net v5 2/7] usbnet: ipheth: check that DPE points past NCM header
Date: Sun, 26 Jan 2025 00:54:04 +0100	[thread overview]
Message-ID: <20250125235409.3106594-3-forst@pen.gy> (raw)
In-Reply-To: <20250125235409.3106594-1-forst@pen.gy>

By definition, a DPE points at the start of a network frame/datagram.
Thus it makes no sense for it to point at anything that's part of the
NCM header. It is not a security issue, but merely an indication of
a malformed DPE.

Enforce that all DPEs point at the data portion of the URB, past the
NCM header.

Fixes: a2d274c62e44 ("usbnet: ipheth: add CDC NCM support")
Cc: stable@vger.kernel.org
Signed-off-by: Foster Snowhill <forst@pen.gy>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
---
v5:
    No code changes. Added Cc to stable and Reviewed-by Jakub tags.
v4: https://lore.kernel.org/netdev/20250105010121.12546-4-forst@pen.gy/
    No change since v3.
v3: https://lore.kernel.org/netdev/20241123235432.821220-3-forst@pen.gy/
    Split out from a monolithic patch in v2 as an atomic change.
v2: https://lore.kernel.org/netdev/20240912211817.1707844-1-forst@pen.gy/
    No code changes. Update commit message to further clarify that
    `ipheth` is not and does not aim to be a complete or spec-compliant
    CDC NCM implementation.
v1: https://lore.kernel.org/netdev/20240907230108.978355-1-forst@pen.gy/
---
 drivers/net/usb/ipheth.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c
index 45daae234cb8..1ff5f7076ad5 100644
--- a/drivers/net/usb/ipheth.c
+++ b/drivers/net/usb/ipheth.c
@@ -242,7 +242,8 @@ static int ipheth_rcvbulk_callback_ncm(struct urb *urb)
 	dpe = ncm0->dpe16;
 	while (le16_to_cpu(dpe->wDatagramIndex) != 0 &&
 	       le16_to_cpu(dpe->wDatagramLength) != 0) {
-		if (le16_to_cpu(dpe->wDatagramIndex) >= urb->actual_length ||
+		if (le16_to_cpu(dpe->wDatagramIndex) < IPHETH_NCM_HEADER_SIZE ||
+		    le16_to_cpu(dpe->wDatagramIndex) >= urb->actual_length ||
 		    le16_to_cpu(dpe->wDatagramLength) > urb->actual_length -
 		    le16_to_cpu(dpe->wDatagramIndex)) {
 			dev->net->stats.rx_length_errors++;
-- 
2.45.1


  parent reply	other threads:[~2025-01-25 23:54 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-01-25 23:54 [PATCH net v5 0/7] usbnet: ipheth: prevent OoB reads of NDP16 Foster Snowhill
2025-01-25 23:54 ` [PATCH net v5 1/7] usbnet: ipheth: fix possible overflow in DPE length check Foster Snowhill
2025-01-25 23:54 ` Foster Snowhill [this message]
2025-01-25 23:54 ` [PATCH net v5 3/7] usbnet: ipheth: use static NDP16 location in URB Foster Snowhill
2025-01-25 23:54 ` [PATCH net v5 4/7] usbnet: ipheth: refactor NCM datagram loop Foster Snowhill
2025-01-25 23:54 ` [PATCH net v5 5/7] usbnet: ipheth: break up NCM header size computation Foster Snowhill
2025-01-25 23:54 ` [PATCH net v5 6/7] usbnet: ipheth: fix DPE OoB read Foster Snowhill
2025-01-25 23:54 ` [PATCH net v5 7/7] usbnet: ipheth: document scope of NCM implementation Foster Snowhill
2025-01-26 11:19 ` [PATCH net v5 0/7] usbnet: ipheth: prevent OoB reads of NDP16 Bjørn Mork
2025-01-26 13:44   ` Foster Snowhill
2025-01-28 11:20 ` patchwork-bot+netdevbpf

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=20250125235409.3106594-3-forst@pen.gy \
    --to=forst@pen.gy \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=gvalkov@gmail.com \
    --cc=horms@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oneukum@suse.com \
    --cc=pabeni@redhat.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