{"id":2231613,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2231613/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20260430232559.285492-4-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":"<20260430232559.285492-4-pablo@netfilter.org>","date":"2026-04-30T23:25:58","name":"[nf,v7,4/4] netfilter: flowtable: use skb_pull_rcsum() 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/20260430232559.285492-4-pablo@netfilter.org/mbox/","series":[{"id":502404,"url":"http://patchwork.ozlabs.org/api/1.1/series/502404/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=502404","date":"2026-04-30T23:25:55","name":"[nf,v7,1/4] netfilter: flowtable: ensure sufficient headroom in xmit path","version":7,"mbox":"http://patchwork.ozlabs.org/series/502404/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231613/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231613/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=UAStU+Sy;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.105.105.114; helo=tor.lore.kernel.org;\n envelope-from=netfilter-devel+bounces-12362-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=\"UAStU+Sy\"","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 tor.lore.kernel.org (tor.lore.kernel.org [172.105.105.114])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g69Kk2FJxz1y1d\n\tfor ; Fri, 01 May 2026 09:26:34 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby tor.lore.kernel.org (Postfix) with ESMTP id B850C3042999\n\tfor ; Thu, 30 Apr 2026 23:26:11 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 00F583CA499;\n\tThu, 30 Apr 2026 23:26:09 +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 553D03C5539\n\tfor ; Thu, 30 Apr 2026 23:26:07 +0000 (UTC)","from localhost.localdomain (mail-agni [217.70.190.124])\n\tby mail.netfilter.org (Postfix) with ESMTPSA id 9C62860180\n\tfor ; Fri, 1 May 2026 01:26:05 +0200 (CEST)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777591568; cv=none;\n b=qT6DahoiT7lQq4XRdDxdmJX84JGuLMbvDeyHrfxAOSq2JYLE+fd35mvbgvF364898+4wpySYNSrLc6mJSoHnUIChImCWIEWgmfZA8h5cye5HE9xGg7b9dMAkufX/RMcindThxxyl6zPFUKAn9Wtx9sHc4/zMPlPsmdDUVyaQ9Wc=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777591568; c=relaxed/simple;\n\tbh=op26drVnlAZANF828pU9seVggArE7EBbP8XO6TCU+iE=;\n\th=From:To:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=lhhq1FI4z6Qjn/4FX7jll9A82OajVxq1qYWJPqqkMj2Lr/W8p7niX+y317Mi2iJWk/i6OBCPuKcDVxZOww1xIEfcX+8chvtxVu/wNqJ3ojk4mxUYemjAiXSERVodM9NstowXBUEErESMHZYgOhgjJPNg7TQl5u3mK7YZLe1xFkg=","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=UAStU+Sy; 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=1777591565;\n\tbh=3czWPMD5Wed6tWpQ1YLxsLZ9gbgPx/elV31P8aAVpNc=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=UAStU+SyjsU58SxA27a2O95CgmqaGtNVe2EsRj+u8rjsmbBwIOBTztTF08mnRTnZc\n\t a4YZ5PY7qSn/m9mdKifdwGDa/B2y2BWOCE+QB35JIAQS9b2wqONBs4c5EcKn6Ip/Jy\n\t 4hQv+PRGJ5c+XjB0TnSld9KxjcdU8bdW29WcqBL8yKr3Gd4Ss6GLJio6qeDX/fdhYh\n\t fuZ/HGqIe5yuBHl8WLEarDCoZMrehsESTca+kYQ2GZVWuaxs8Uthzd/qWd0VdKXpyR\n\t JtdI9hmUuC32cOyKENxsllsCkc7+6IgpMqX+U5EkMLd5461P7VwaDg693hrr2POELE\n\t DYw8hDOh+hfXQ==","From":"Pablo Neira Ayuso ","To":"netfilter-devel@vger.kernel.org","Subject":"[PATCH nf,v7 4/4] netfilter: flowtable: use skb_pull_rcsum() pop\n vlan/pppoe header","Date":"Fri, 1 May 2026 01:25:58 +0200","Message-ID":"<20260430232559.285492-4-pablo@netfilter.org>","X-Mailer":"git-send-email 2.47.3","In-Reply-To":"<20260430232559.285492-1-pablo@netfilter.org>","References":"<20260430232559.285492-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---\nv7: replace previous patch 4/4, use skb_pull_rcsum() for both vlan/pppoe\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":["nf","v7","4/4"]}