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 E72272ED154; Tue, 25 Aug 2026 13:38:37 +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=1787665119; cv=none; b=XIiIaRh7GjwGZCFy0xe+yX14NaCviaXYQENKfPD1+S2lsBCb9TUomvLDrm+YWtGHFpSCJgHl15lv3h/aEUsK3Tsuwc9kTpi5+S1OvHMV62jfn4MlqK5a9NCVB3FcbVTyOT0/+kZJoiAXzKTJAXC1ESO0QvgsGoS5v6r80wpnA4g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787665119; c=relaxed/simple; bh=5e2QQ5tHJ6L4YfBW2Ogb9NOoH7qPplBSUZxrmHmtwGQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YOnEVY7FbWn3KTpVlpddk8JOtd6m4evsVxeBPLvq4sbtlRWG6CrJ+OqMXjJyWgSFcJ28hYiHbZbB8wODPLaQmrJLyQ4a+OoKxyrdT7kff6CqAcKzZlyNVpyeq4s1WQ0yaaQSUH8MCeATTknvGU3oTEx7Q+q0TktOY3aMvgUv+EI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=w7bATgXk; 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="w7bATgXk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4F471F000E9; Tue, 25 Aug 2026 13:38:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787665117; bh=Z40hI+l7FKyCnEvdByKyGUlAkeMahaIBOK2tg9xRXZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=w7bATgXk8YnuDNx9Qa0uXTQ9IfMK1tUwXO1dwE5O/KZtlhSu5muDNzM/npx9B21Ew F4JqXjGiSq4MGi5V1jOaVHAPOw+bJ9ciW3nrPs89bFYr8rynvUlWVZSaozOroy4sKJ 2nL9OmtMB71+RWg6Iyy4sOUMMKgD5ueTMEnp65y4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andrew Lunn , Shaoxu Liu , Griffin Kroah-Hartman , Simon Horman , Jakub Kicinski Subject: [PATCH 6.18 14/94] rndis_host: add overflow check in rndis_rx_fixup() Date: Tue, 25 Aug 2026 15:25:10 +0200 Message-ID: <20260825132542.447786488@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260825132541.887883084@linuxfoundation.org> References: <20260825132541.887883084@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Griffin Kroah-Hartman commit 965a251f23ff69cfb4486974d4532e9bb551c7fc upstream. 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. Cc: Andrew Lunn Cc: Shaoxu Liu Signed-off-by: Griffin Kroah-Hartman Signed-off-by: Greg Kroah-Hartman Reviewed-by: Simon Horman Link: https://patch.msgid.link/2026070900-denim-brook-52d4@gregkh Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/rndis_host.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) --- 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, s 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, s /* 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),