{"id":2231782,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2231782/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260501122237.296262-15-pablo@netfilter.org/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/1.1/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260501122237.296262-15-pablo@netfilter.org>","date":"2026-05-01T12:22:37","name":"[net,14/14] netfilter: flowtable: use skb_pull_rcsum() to pop vlan/pppoe header","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"702cd74cb3df6148cc8e947c919ea8731fbbda64","submitter":{"id":1315,"url":"http://patchwork.ozlabs.org/api/1.1/people/1315/?format=json","name":"Pablo Neira Ayuso","email":"pablo@netfilter.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260501122237.296262-15-pablo@netfilter.org/mbox/","series":[{"id":502449,"url":"http://patchwork.ozlabs.org/api/1.1/series/502449/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=502449","date":"2026-05-01T12:22:23","name":"[net,01/14] netfilter: replace skb_try_make_writable() by skb_ensure_writable()","version":1,"mbox":"http://patchwork.ozlabs.org/series/502449/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231782/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231782/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","netfilter-devel@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=netfilter.org header.i=@netfilter.org\n header.a=rsa-sha256 header.s=2025 header.b=Tx4dK0pG;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-12385-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=\"Tx4dK0pG\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=217.70.190.124","smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=netfilter.org"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g6Vfm48VYz1xqf\n\tfor ; Fri, 01 May 2026 22:27:28 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 06B74301E22D\n\tfor ; Fri, 1 May 2026 12:23:07 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id D2EDF3A255D;\n\tFri, 1 May 2026 12:23:06 +0000 (UTC)","from mail.netfilter.org (mail.netfilter.org [217.70.190.124])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 21C653A2551;\n\tFri, 1 May 2026 12:23:01 +0000 (UTC)","from localhost.localdomain (mail-agni [217.70.190.124])\n\tby mail.netfilter.org (Postfix) with ESMTPSA id E3A0260253;\n\tFri, 1 May 2026 14:22:59 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777638186; cv=none;\n b=kPLDJ1e7Dy6zBzAfviUFEgcw3/YCbP79xdEDhMKFERxw4y61ugqFTgdXhImAoXO2cXjhjYrBIWzE/abr/BiFJkp4VP6MvnBm5HiBku6ptyhAaEa38WeTqxBgD8PlVqt0yE3JPV8TfGoRObZ0woZcyFrUAnCmXyPqqpp4xf9Wd+4=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777638186; c=relaxed/simple;\n\tbh=eZX95da61jVvKmEIf5EIzD0chI2RN4sF1ujn1IDP5Vo=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=EagkA954YAji6F/kAw04/+eWaYJSTd8o0jIrrTNi++1oA2pEoaMAmuELjk5+il8leYaUGj8+BvxE8p8j2+HjMXHCtDWXFxmxIzPConbf9YcCiCmI3S5vRdnfXP8c7lFP6ugk/zuT01hviqaeCn66Yn4g38HKzNiXwzPzGjCVir4=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=none (p=none dis=none) header.from=netfilter.org;\n spf=pass smtp.mailfrom=netfilter.org;\n dkim=pass (2048-bit key) header.d=netfilter.org header.i=@netfilter.org\n header.b=Tx4dK0pG; arc=none smtp.client-ip=217.70.190.124","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=netfilter.org;\n\ts=2025; t=1777638180;\n\tbh=/eAFwjpRQs6IKf8l7Uq5+8LYAhM8liveI/Pt/FDQG3c=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Tx4dK0pGaTY9crPEOEeVjtHuppSkGxK14h2TfrTsXpCGLt/a/PHR8HAcHB0eQhHRZ\n\t tuKr3uPw3sbG1EHvnpWDbGhc0oEa3TryKFTiFXHZ05psHLGLyc2p/SIe4WY296HNcw\n\t L07O896WH5+8jNufShpMamrm+AIWU5E1u7Kf7IlQPaJKQhjIKEplzZVajD1QB7ATk1\n\t ekcC2k/KH7MtQjK3yRUJPPgfLniaQpyHgmN7twVcTqxoJseNHaQpYAiUqdZqAKwo0u\n\t trurBKMjnphDGPSEc9u4YqXlQ6TvkkHqjE6dBfOYiV/Jc9jnkJPmnQBjjyMq6jOOau\n\t hGUgDE7+UOylg==","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Cc":"davem@davemloft.net,\n\tnetdev@vger.kernel.org,\n\tkuba@kernel.org,\n\tpabeni@redhat.com,\n\tedumazet@google.com,\n\tfw@strlen.de,\n\thorms@kernel.org","Subject":"[PATCH net 14/14] netfilter: flowtable: use skb_pull_rcsum() to pop\n vlan/pppoe header","Date":"Fri, 1 May 2026 14:22:37 +0200","Message-ID":"<20260501122237.296262-15-pablo@netfilter.org>","X-Mailer":"git-send-email 2.47.3","In-Reply-To":"<20260501122237.296262-1-pablo@netfilter.org>","References":"<20260501122237.296262-1-pablo@netfilter.org>","Precedence":"bulk","X-Mailing-List":"netfilter-devel@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"This adjusts the checksum, if required, after pulling the layer 2\nheader, either the pppoe header or the inner vlan header in the\ndouble-tagged vlan packets.\n\nFixes: 4cd91f7c290f (\"netfilter: flowtable: add vlan support\")\nFixes: 72efd585f714 (\"netfilter: flowtable: add pppoe support\")\nSigned-off-by: Pablo Neira Ayuso \n---\n net/netfilter/nf_flow_table_ip.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)","diff":"diff --git a/net/netfilter/nf_flow_table_ip.c b/net/netfilter/nf_flow_table_ip.c\nindex 2eba64eb393a..9c05a50d6013 100644\n--- a/net/netfilter/nf_flow_table_ip.c\n+++ b/net/netfilter/nf_flow_table_ip.c\n@@ -445,13 +445,13 @@ static void nf_flow_encap_pop(struct nf_flowtable_ctx *ctx,\n \t\tswitch (skb->protocol) {\n \t\tcase htons(ETH_P_8021Q):\n \t\t\tvlan_hdr = (struct vlan_hdr *)skb->data;\n-\t\t\t__skb_pull(skb, VLAN_HLEN);\n+\t\t\tskb_pull_rcsum(skb, VLAN_HLEN);\n \t\t\tvlan_set_encap_proto(skb, vlan_hdr);\n \t\t\tskb_reset_network_header(skb);\n \t\t\tbreak;\n \t\tcase htons(ETH_P_PPP_SES):\n \t\t\tskb->protocol = __nf_flow_pppoe_proto(skb);\n-\t\t\tskb_pull(skb, PPPOE_SES_HLEN);\n+\t\t\tskb_pull_rcsum(skb, PPPOE_SES_HLEN);\n \t\t\tskb_reset_network_header(skb);\n \t\t\tbreak;\n \t\t}\n","prefixes":["net","14/14"]}