From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795045578; b=GGxfySJPJV658IEd4qXhI5R0E6gR+06uKjcwVIdQnnplJzkIbJA5x5cKbydkeSw7lu+9 sjQ/ql1+rmVyX5hWtnu2KzjI0QThbmrmSvLd7e/ow4gD8Pmsw9wOW5FW+Zw3UO9jWN4lH r9bVUtuiANjujY5io3yxyGBOUggBFk2ubVkl6ozb2ZJSbXe6ndcBC656rdezv+jlGJhMD 1WGoZftSaptTa9Uz0iPryeNjhcHLpKBw0B2cv3/jj2L21ayMXADbkV00TDb+MIRKuoTHp AMJ9dkyZpcPr/yQkwGqzpKv5S42SceSPTxqTbxCuHSHMjBNmIJzjGjXsrJg5QIicENQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045578; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=brChdI4n0m31BwnMl9ZXFFeqvN19HN+5ZoDBid6Jbxw=; b=yaSDbl0JY05dRRB1jKwR91pI2ZdvHkCYx36mXa9eAeqS62c5Ixd+7HOU++zsHzNJUeOc dwGd1GHnb1a31v4nzfbAqWYRMdqzcZgEOjaZ+XLq5Xi9wN0G/fGMnluS5882kSWpPFq1f 6XQg7dxLQ7kl2sc/hj8YaRSJ3b4qH8JGHx6h8k9wZ/A0HX8xM3ztIMjLe6R5TrSrxzreo kb397wCtD3YUcGK3vhvTZaGDp4cibkHJ7RY4bdfSZMY1b7zhCujKnNh52LbXHBvBavz/M 4c/+oKigOl//fNQv7aFfCoGhfla82ZWZcguhWFvm8CFHyewfR/GlSKG0I8VzdL7w2xA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=AaTCms0y; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC45C606A32A; Wed, 18 Nov 2026 23:46:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=AaTCms0y Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E41B1F000C4; Wed, 18 Nov 2026 23:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045577; bh=brChdI4n0m31BwnMl9ZXFFeqvN19HN+5ZoDBid6Jbxw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=AaTCms0ybadZNoxcaZ5vRpYGe7y/7WPNBZKCEhHAOEuxlP5dn6647itWTOZdd7dwV AicB0eMPd0bQuDUwTxFwwUbH5+BbCtQEpXbBDteSd290KuCIkMGR7Zd7fXlnH0T+yQ QPk6YR4Xg9mc9vEMH3XJ3U3iodcGp9PjGfPiRSLI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 0972/2857] net: skbuff: dont BUG() on a bad csum_start in skb_copy_and_csum_dev() Date: Wed, 18 Nov 2026 15:33:26 +0100 Message-ID: <20261118150236.606317522@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit 56453199d28f0072a8196fba14b2d702632e2219 ] skb_copy_and_csum_dev() copies everything up to the checksum start out of the linear area, and BUG()s if the checksum start is past the end of the linear area. It misses the other direction: a CHECKSUM_PARTIAL skb that has been pulled past its csum_start gives a negative offset, which gets past the check and becomes a ~4GB copy. It also trusts csum_offset when it stores the folded checksum. So far skb_copy_and_csum_bits() BUG()ing on a short skb has covered for that, but once it returns instead, a bad csum_offset would write past the end of the caller's buffer. The function returns void and its callers are drivers copying a frame into a bounce buffer just before handing it to the hardware. There's nothing for them to back out of, so check both ends of csum_start and that the checksum field fits in the frame, and if not, copy the whole frame with skb_copy_bits() without filling in the checksum, with a DEBUG_NET_WARN_ON_ONCE() for debug kernels. The frame goes out with a bad checksum and is dropped by the receiver. If even that copy fails, zero the buffer so the driver doesn't send stale bytes. Signed-off-by: Josef Bacik Cc: stable? The trailers only have Assisted-by: and Signed-off-by:. No Link: https://patch.msgid.link/20261007-b4-skbuff-bug-on-v2-5-b9a5f732895b@toxicpanda.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/core/skbuff.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index f6140e0453ef4..78a0d1a4d8f45 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3392,7 +3392,18 @@ void skb_copy_and_csum_dev(const struct sk_buff *skb, u8 *to) else csstart = skb_headlen(skb); - BUG_ON(csstart > skb_headlen(skb)); + if (unlikely(csstart < 0 || csstart > skb_headlen(skb) || + (skb->ip_summed == CHECKSUM_PARTIAL && + csstart + skb->csum_offset + sizeof(__sum16) > + skb->len))) { + DEBUG_NET_WARN_ON_ONCE(1); + /* Send the frame without the checksum filled in, or send + * zeroes if we can't even copy it. + */ + if (skb_copy_bits(skb, 0, to, skb->len)) + memset(to, 0, skb->len); + return; + } skb_copy_from_linear_data(skb, to, csstart); -- 2.53.0