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 5299024EAB1; Sat, 30 May 2026 18:20:35 +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=1780165238; cv=none; b=d1pBN70sFVDRjADx+LH8SSOxhsJEVy88NPLpaM3hsqnA4UNNLpOyx2WXRNzSFM93NHe1k/QkNx2DqRRRAPiToScShglRoMFZkjdK5/U4DvlRxqJWORxy1g0T72iRsth/gi9AGFS+stG7JSemllWJ56doXLs+RWoFjxz2bwXnx1Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780165238; c=relaxed/simple; bh=1P+/jLpJfTGAiis4arMgapkZ0i15rGVZrbiTQWw2NJ8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z6+kWDycwwq/cuGaJpYvV7Y3Enjc1CKBNA4PvfXPilPlBeMqgmVIAKP/t6sMSrXlaXOk/CbRZRvOuBPvvY/I6D1zAtO+7Gp9cbqNdiOsD9kTp/RantHcANRTskCRVkfS1Fkg+Tvc9L4nQVzCunrYWeBdnXPfCAF2j7HxmfQn1Ds= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Qdn4sukh; 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="Qdn4sukh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 265CC1F00893; Sat, 30 May 2026 18:20:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780165234; bh=ZlM/Ofjo4fJEcqex5HFq0b4hJb0BuJwECrS9gfx3d8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Qdn4sukhhFNUIuB8EAEcJtiZ7QIdJE9SvAwrL6UjZqZasu/tDsaWieVjDc2SFnk+2 FgeHdcet5yKoqDn+rzF3ekwiwFmACN35cjbNhOVR84tz22F26p7MbjCbmkNpg88ier 8O7UIkcVn7Qum871hS43gNBgxp2I66OuHNcVA0lY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yifan Wu , Juefei Pu , Yuan Tan , Xin Liu , Ren Wei , Ruide Cao , Ren Wei , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 019/589] net: sched: act_csum: validate nested VLAN headers Date: Sat, 30 May 2026 17:58:20 +0200 Message-ID: <20260530160225.084295835@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160224.570625122@linuxfoundation.org> References: <20260530160224.570625122@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ruide Cao [ Upstream commit c842743d073bdd683606cb414eb0ca84465dd834 ] tcf_csum_act() walks nested VLAN headers directly from skb->data when an skb still carries in-payload VLAN tags. The current code reads vlan->h_vlan_encapsulated_proto and then pulls VLAN_HLEN bytes without first ensuring that the full VLAN header is present in the linear area. If only part of an inner VLAN header is linearized, accessing h_vlan_encapsulated_proto reads past the linear area, and the following skb_pull(VLAN_HLEN) may violate skb invariants. Fix this by requiring pskb_may_pull(skb, VLAN_HLEN) before accessing and pulling each nested VLAN header. If the header still is not fully available, drop the packet through the existing error path. Fixes: 2ecba2d1e45b ("net: sched: act_csum: Fix csum calc for tagged packets") Reported-by: Yifan Wu Reported-by: Juefei Pu Co-developed-by: Yuan Tan Signed-off-by: Yuan Tan Suggested-by: Xin Liu Tested-by: Ren Wei Signed-off-by: Ruide Cao Signed-off-by: Ren Wei Reviewed-by: Simon Horman Link: https://patch.msgid.link/22df2fcb49f410203eafa5d97963dd36089f4ecf.1774892775.git.caoruide123@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/act_csum.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/net/sched/act_csum.c b/net/sched/act_csum.c index 4fa4fcb842ba7..107dc690de051 100644 --- a/net/sched/act_csum.c +++ b/net/sched/act_csum.c @@ -602,8 +602,12 @@ static int tcf_csum_act(struct sk_buff *skb, const struct tc_action *a, protocol = skb->protocol; orig_vlan_tag_present = true; } else { - struct vlan_hdr *vlan = (struct vlan_hdr *)skb->data; + struct vlan_hdr *vlan; + if (!pskb_may_pull(skb, VLAN_HLEN)) + goto drop; + + vlan = (struct vlan_hdr *)skb->data; protocol = vlan->h_vlan_encapsulated_proto; skb_pull(skb, VLAN_HLEN); skb_reset_network_header(skb); -- 2.53.0