From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D02CD3382DE; Mon, 20 Apr 2026 15:51:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700276; cv=none; b=Vmm9eXQkQ7KI5mFptATKDFDXV2ol4jUeGVoHD3ypSopbtdtuvE9fuOtHP/Box/tFju1FOGjujg5bNRfl/l5kUMELnofYcNTGzdJ2Zyp0ZtgDMpTS1B4HOsJmcuRKXVmxu9WDjxQnsuAhRVIHB7IABJoH6z6VsQ3XqAe4zd37EJM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700276; c=relaxed/simple; bh=J/9En7zE5lMJ3EPur59idZn7mtDGMMaZDEpVR2RjNJc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GXz/y9luwyKpStXFVK3UcsVZXgLdPhjt+KfNb05wHQasYw4upLDnrs4iUKz0opksfY+j+RwMaCngF/sYVJC/VHOUx1WSbAbypewe42ZY19Aw2EwcmTPc5jL3EhTAAeynvJ8pa3VG+4BS46iXnohDSaLwzKtgKkKxFJv/6Yry7TY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SdnY+UP1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SdnY+UP1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6718EC19425; Mon, 20 Apr 2026 15:51:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776700276; bh=J/9En7zE5lMJ3EPur59idZn7mtDGMMaZDEpVR2RjNJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SdnY+UP1XwqYbEJ6FaxfgHSiMGKul0jOCa/LBSl7sn0L/vHh64rO22tv2rbdLjmgy baCC+Dm5NW2EDl5MszWtTzraB73DBQjB7BF7Vem+7kxAj31RRppU7L2b9cEap/wpMS nx5QWAKN2DLG3Qc5hPPuiG33tQXwhtHdMWCKLEG0= 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 6.19 077/220] net: sched: act_csum: validate nested VLAN headers Date: Mon, 20 Apr 2026 17:40:18 +0200 Message-ID: <20260420153936.810430649@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420153934.013228280@linuxfoundation.org> References: <20260420153934.013228280@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.19-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 0939e6b2ba4d1..3a377604ad343 100644 --- a/net/sched/act_csum.c +++ b/net/sched/act_csum.c @@ -604,8 +604,12 @@ TC_INDIRECT_SCOPE int tcf_csum_act(struct sk_buff *skb, 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