From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 A8B24421A12; Thu, 9 Jul 2026 12:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783599849; cv=none; b=f9IZxkmUxC3wTOlPwikX9NjjOP58IyKzcxytZtIOlQ3tCw03kgopqmDvpFuL2GftUGnvHHWaUvxSRJxQkrzzrWqlQr6yCI3QpuON5gDWXTUZQzqmQkScr4nBtKWLyQEOaAD2m98s8y9l3ICl3ClSsunP2U4tpqUrn62z/5aSIF0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783599849; c=relaxed/simple; bh=Z2p6mTxexM5ayWvNEc+bvn3ualEgwR9TXegPvbYJdaY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NtnERQWOYyy5VjFQrAuvXzfZ/+zsNL3WkMHW0a/K4nhY532OcagT3PGzCkx/7nYQxk9aaRuk9WstX3soHBUGHqMponjkNlkMJBfuJcMaHUJ6LPnWnje4X+ewrHvQhSYIeFe/Xz4m3unCvcAKHk9InzzBTU346TLBUQyfU6WsWJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UTltpLRG; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UTltpLRG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CD7171F00A3A; Thu, 9 Jul 2026 12:24:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1783599845; bh=otlFjEoj8m+amo7QVt6GIhwzNauV5M27a5j3zyxRS0I=; h=From:To:Cc:Subject:Date; b=UTltpLRGWJ19iX0BQYsrgpyppRlMSG+TIUgWW2knJjg2nKVbg44E2sRKvokfMQ5ad AeheMyTTa3+nwxvuzva7vlgcw5c2i/JfUZJPHxbWBjLgmNKGRB2M/YerXqMKiGNjf1 XemSoFJ5YVTJz6SCZtFUoEpYOEyZaN06vCeibNms= From: Greg Kroah-Hartman To: netdev@vger.kernel.org, linux-usb@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Griffin Kroah-Hartman , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shaoxu Liu , Greg Kroah-Hartman Subject: [PATCH net-next] rndis_host: add overflow check in rndis_rx_fixup() Date: Thu, 9 Jul 2026 14:24:01 +0200 Message-ID: <2026070900-denim-brook-52d4@gregkh> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1902; i=gregkh@linuxfoundation.org; h=from:subject:message-id; bh=FTegPm6uIQsGEinvailIqfu5TwgyFj6hWEU3lbCIQCk=; b=owGbwMvMwCRo6H6F97bub03G02pJDFn+kx58ehbpcXWdzz5V4d6Q84+E2q1TNx34Gq1zjEEq/ bjSBevnHbEsDIJMDLJiiixftvEc3V9xSNHL0PY0zBxWJpAhDFycAjAR3hUMCyb+T2bed3Fp3ruO G6ob/+rdef9sQxPDgg0LCkXuqd3gVNuYEqb9w81kfotCJAA= X-Developer-Key: i=gregkh@linuxfoundation.org; a=openpgp; fpr=F4B60CC5BF78C2214A313DCB3147D40DDB2DFB29 Content-Transfer-Encoding: 8bit From: Griffin Kroah-Hartman Add an overflow check to ensure that data_offset + data_len + 8 does not wrap, which would enable an OOB read of the USB data buffer. Assisted-by: gkh_clanker_1000 Cc: Andrew Lunn Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: Shaoxu Liu Signed-off-by: Griffin Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/rndis_host.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 5e39d05a2d7b..37d4865f5c5e 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c @@ -14,6 +14,7 @@ #include #include #include +#include /* @@ -506,6 +507,7 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb) struct rndis_data_hdr *hdr = (void *)skb->data; struct sk_buff *skb2; u32 msg_type, msg_len, data_offset, data_len; + u32 overflow_check; msg_type = le32_to_cpu(hdr->msg_type); msg_len = le32_to_cpu(hdr->msg_len); @@ -514,7 +516,9 @@ int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb) /* don't choke if we see oob, per-packet data, etc */ if (unlikely(msg_type != RNDIS_MSG_PACKET || skb->len < msg_len - || (data_offset + data_len + 8) > msg_len)) { + || (data_offset + data_len + 8) > msg_len + || check_add_overflow(data_offset, data_len, &overflow_check) + || check_add_overflow(overflow_check, 8, &overflow_check))) { dev->net->stats.rx_frame_errors++; netdev_dbg(dev->net, "bad rndis message %d/%d/%d/%d, len %d\n", le32_to_cpu(hdr->msg_type), -- 2.55.0