From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5048831A068 for ; Thu, 25 Sep 2025 18:31:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758825065; cv=none; b=dZa6dUGInjZzedVVG2pHr1V286WqQwBXrNq11RasslA5eJ3Qq30x5g3M4Sh2vER/AHbPsIkGyeLDwLqjM3cfWsHewjAbR23Ve4vSPk/hlPUpzPoGyb9oZfUiovWCc492ORw38HyL+p+aK3ShzTRbmnzWpKf8k1fwLzpBuVFpviw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758825065; c=relaxed/simple; bh=l8WqN102Lw5inmuS7NKuYpjmsQngGiA54DeLWZMXAkw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TcP8EpKamSL2ryFqZFjVyZjuZpUODw83o3FXtpIvIdXZQoSG0hSA2PxTvIAS2dEmxZxuqDwQAo6MlnPEA35QDLyr/5Zdpxb9jWsb7VMgsAAnJTlZjZ1cuaXlUR3sLswi9WH0WFnBcUud/dZRVprRINbRg9ucOASTtHseesrybtU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dersAzag; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dersAzag" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-afcb7ae31caso178374966b.3 for ; Thu, 25 Sep 2025 11:31:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758825062; x=1759429862; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4sfKxL2KrtcwkwgsavqpRxPdbGefQzHoIqXv/DUN+jw=; b=dersAzagCMPi0ZZfC7fYyhY1nRM6TzPx7Ii/ToFGER+DK07iWG+iRUHZ8mgM7ETf7q Eopn19UdY7hKuzAxklak56FGjRu8R+qcERdnzt+IXjsas5OVnJSboWpC0Xu7WQv7MFSx +A2yNWRbbKdQo2Vs4MnJ33fsxDd5Rg8Q217W5tcwEcVMF6o9EgVXkNLK5bLqq03ZkKC4 Wtb/Agglxj0QA82ikD2Hiw57t1WihrQaBG3q1SIGQa+ZIR6SeHeB1X1WpDctHMzewUws E2jNWUOlUaKCc2g/XyhvvMlzS2+njWHT3onCGleYYXx48+xyd+jlsIhyWF7BAXh12Qkr Q47g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758825062; x=1759429862; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4sfKxL2KrtcwkwgsavqpRxPdbGefQzHoIqXv/DUN+jw=; b=teK7L+2MTP1Sgi7Iyxb6YoZxGo4D3/mYsXqiVAsHA1SjL4+ZZL0r5F2N0gXsiBRxjS vDYkRyAmRGex7bPG2aEKeJvl/MnVJyjo9+m6ooetGKiDQl2whIEqg5twNw6iaKOR2MTE mWMPyi5oGp10R9rOLdbtWuIn/imhNbL6SY9VOf62TFQOF9kUmUXlm5c9adMKKuIji6Ya VtbEcz3L3WW5PKd1fuLSydQjvtFV88xwiINBHurByCpkxPb2UiFL3AmwM0HUvuco/anf MF7ntNnpeVTdcSlc8dc08mOEJNbluZYrJz+t80KvlfAytbqPq0RdHO0EdC3JzQOlHZQu e85g== X-Forwarded-Encrypted: i=1; AJvYcCXW40/ieenCsd40l2aJwli1lL6DPrgMAT7y9ehPrrGcF3yTUou2fN0SRVAPwyNsZZn46UJJszo=@lists.linux.dev X-Gm-Message-State: AOJu0YyXL5pJ8uJ8ewKi3BUeEmDNRIMKIBAM6NG7Kpd4OazuJyeB/pC1 cpZdorVySri7s25Ap+uvIr5CvJmMtqIGiyDvKLGoLlI0V4TSMyodovdA X-Gm-Gg: ASbGncuDOQdb3QvDUAxfDphE3O2ZPZzZ9GMOc15xAncDwmkUnQA/qbTh4i1+kNi8mhY doOUJjdZk1DslvMy3LUg6P4k7PRFCWavQGXy8j4cM4yI3V7Pj+oN456JG6h9RiDfSNwpW19mxCP LBlAI+qOHI5hjhUKVBVWZPbl2UJ6SmylH7rO+1gGSAt0MgZW68vcbpl8rm8kfZvPisEFT+GD27L zSwLMg/skc2S7lbzgasgCY2Uf6Y209phe+9DkLXue/CAWqm7HWC/PbvUDf+PKE0EnExVMlI9IGy Tm+tmV3JvIIkCnR9Nm/0b5KU3+JG5WRRHuVi2B9ZLXkxr94TVE9pAfxIoWKefB+Fn3UlWdMUi61 IJGqYph8xImMUPyEu8b2JYNKLaF/rTqRLTzxZCw2+jKKAYP1aM3fWJYkkNM99FpmJ9cbsw4PW0C s7fF52ar7b0WDnwzxxcQ== X-Google-Smtp-Source: AGHT+IHtby7hw89di5zdtb7t9pM1jtiFx92okk70oCOH9Ecm7ZWyNfwmWukJyHxtzj/GWmn6xdX11w== X-Received: by 2002:a17:907:9447:b0:afe:e1e3:36a2 with SMTP id a640c23a62f3a-b34bad22708mr485258466b.31.1758825061549; Thu, 25 Sep 2025 11:31:01 -0700 (PDT) Received: from eric (2001-1c00-020d-1300-1b1c-4449-176a-89ea.cable.dynamic.v6.ziggo.nl. [2001:1c00:20d:1300:1b1c:4449:176a:89ea]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b3545a9c560sm211198666b.107.2025.09.25.11.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 11:31:01 -0700 (PDT) From: Eric Woudstra To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Nikolay Aleksandrov , Ido Schimmel Cc: netfilter-devel@vger.kernel.org, netdev@vger.kernel.org, bridge@lists.linux.dev, Eric Woudstra Subject: [PATCH v15 nf-next 3/3] netfilter: nft_chain_filter: Add bridge double vlan and pppoe Date: Thu, 25 Sep 2025 20:30:43 +0200 Message-ID: <20250925183043.114660-4-ericwouds@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250925183043.114660-1-ericwouds@gmail.com> References: <20250925183043.114660-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: bridge@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This adds the capability to evaluate 802.1ad, QinQ, PPPoE and PPPoE-in-Q packets in the bridge filter chain. Signed-off-by: Eric Woudstra --- include/net/netfilter/nf_tables.h | 48 +++++++++++++++++++++++++++++++ net/netfilter/nft_chain_filter.c | 17 +++++++++-- 2 files changed, 62 insertions(+), 3 deletions(-) diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index e2128663b160..4a55972881b1 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -88,6 +89,53 @@ static inline void nft_set_pktinfo_unspec(struct nft_pktinfo *pkt) pkt->fragoff = 0; } +/** + * nft_set_bridge_pktinfo - calls nft_set_pktinfo and advances + * network_header to the header that follows the pppoe- or vlan-header. + */ +static inline int nft_set_bridge_pktinfo(struct nft_pktinfo *pkt, + struct sk_buff *skb, + const struct nf_hook_state *state, + __be16 *proto) +{ + nft_set_pktinfo(pkt, skb, state); + + switch (*proto) { + case htons(ETH_P_PPP_SES): { + struct ppp_hdr { + struct pppoe_hdr hdr; + __be16 proto; + } *ph; + + if (!pskb_may_pull(skb, PPPOE_SES_HLEN)) + return -1; + ph = (struct ppp_hdr *)(skb->data); + switch (ph->proto) { + case htons(PPP_IP): + *proto = htons(ETH_P_IP); + skb_set_network_header(skb, PPPOE_SES_HLEN); + return PPPOE_SES_HLEN; + case htons(PPP_IPV6): + *proto = htons(ETH_P_IPV6); + skb_set_network_header(skb, PPPOE_SES_HLEN); + return PPPOE_SES_HLEN; + } + break; + } + case htons(ETH_P_8021Q): { + struct vlan_hdr *vhdr; + + if (!pskb_may_pull(skb, VLAN_HLEN)) + return -1; + vhdr = (struct vlan_hdr *)(skb->data); + *proto = vhdr->h_vlan_encapsulated_proto; + skb_set_network_header(skb, VLAN_HLEN); + return VLAN_HLEN; + } + } + return 0; +} + /** * struct nft_verdict - nf_tables verdict * diff --git a/net/netfilter/nft_chain_filter.c b/net/netfilter/nft_chain_filter.c index b16185e9a6dd..a5174adb1abc 100644 --- a/net/netfilter/nft_chain_filter.c +++ b/net/netfilter/nft_chain_filter.c @@ -233,10 +233,16 @@ nft_do_chain_bridge(void *priv, const struct nf_hook_state *state) { struct nft_pktinfo pkt; + int ret, offset; + __be16 proto; - nft_set_pktinfo(&pkt, skb, state); + proto = eth_hdr(skb)->h_proto; + + offset = nft_set_bridge_pktinfo(&pkt, skb, state, &proto); + if (offset < 0) + return NF_ACCEPT; - switch (eth_hdr(skb)->h_proto) { + switch (proto) { case htons(ETH_P_IP): nft_set_pktinfo_ipv4_validate(&pkt); break; @@ -248,7 +254,12 @@ nft_do_chain_bridge(void *priv, break; } - return nft_do_chain(&pkt, priv); + ret = nft_do_chain(&pkt, priv); + + if (offset && ret == NF_ACCEPT) + skb_reset_network_header(skb); + + return ret; } static const struct nft_chain_type nft_chain_filter_bridge = { -- 2.50.0