From patchwork Tue Dec 10 09:44:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Woudstra X-Patchwork-Id: 13901156 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) (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 02003210F57; Tue, 10 Dec 2024 09:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733823979; cv=none; b=ZvZgV7/Zc7OVlxoveTZX5iQhSBMBrrDO4KBDPD6xPbJjswz7fkqMwP5rM2OW9e0OdBWsBtfjW4VuJmwzgAJMCVXv4faDNFgVxZPrHqGIYQfEv46LY8DuwLuTzdAtXgu/NuhXKZd0lQg4En0o1RmYGIv81T0QD/WX9N8Lk+njEt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733823979; c=relaxed/simple; bh=EiUlqjqcyycmVQh/cReUaNfMFD5MK6JvPeuoOO/UWjE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aggJ9BAeLDdr6yWnfKpqxeUfGIXdiHrBX2i5q4FUfMbgYIF3wIiKJiNjs7A08/xWQmA461mVZ7nUHqIf7IRprEG/6eXAIqwHJJE0wq/chYZr6qY7sWauuwudIeMF+SVSbzkMKe7wFEE/bmgKEsOPHBDdUkYFhjk/3CVcBzJHnG0= 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=CtWZLFi/; arc=none smtp.client-ip=209.85.208.49 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="CtWZLFi/" Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5d3f28a4fccso2842556a12.2; Tue, 10 Dec 2024 01:46:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733823975; x=1734428775; darn=vger.kernel.org; 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=k+WwlYEDG0HLvBd8VAnV5F5MIiHlMD5bJhzWof6nBUU=; b=CtWZLFi/mVN6RzwoaQ6UIMblar+1UtvjdiDOpfNrFX/g+npAk4O7dJEeNnhvkYUNfc NE+IWuP1zgX5eL4kwpCdj5SvgPAubivXpq4NVtCNCB5LsA8RQeIsfbXghtICijJ92IGl W6teiWeJ5MnbIlhGcK4sQGeaeFQ40P/yICRVPeCzE89h4bgEaKGTRBdZvfW1mn0RtEi9 SEdqvzhiWksZ3Lpp0OlH9b/w/Nlw53OdGuqSFxlsDayCeRYCdUz1eL5dBEC3yGz6nLmE InyAe5E+hEMVkdZPVNvCHl/x22KJP8dAciYh6y7+mAzzutsAnVAsIRFmizMADop3NZCB /mhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733823975; x=1734428775; 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=k+WwlYEDG0HLvBd8VAnV5F5MIiHlMD5bJhzWof6nBUU=; b=UrvEP1ouPHQ5fUOUYmDSegHi1k7ebkJmn7rkltVoIc0hXBYLtV/0iB3mZP7z2OOSm2 +eIr79ulN6+c38VxXD+9HlNdoMARYweYqC1vvRfpHghbBEzb3kCmWXTSw+9p28d/S28R EO9PZ3q/TVobziVCSs4IVN/QtNcavabvcgSSM+Axw/jH0WW58nI4eE9bYLMvX2JQrwcH MUp1fbury5+l3HdSumJ4jwu11bCtVI9nIH5ZqUG/gzHpx8Icb/b7AjMBxw9eXsEPwWUy fr+1wnw/qVNMO1LlKj/M3Z1BqfcTMhz7hf8vnqvcdLs9WjhqtcHqGZG4Uv9qVKjhu4Xk r6nQ== X-Forwarded-Encrypted: i=1; AJvYcCU6GrQaM61HZ6lq8teVqfNU89hnBwmdqtEM22XW3/m4bIRUskAxDFCEiANTG/ge4djGaAvl7s1YG6teTXzSfSie@vger.kernel.org, AJvYcCUycLC7tK2+C9abCYkqLlBmQLLPgWWaDWDq+P1Uwo87FTz/nR+Jlzt8clnpKi9FGDIIbs6A80mGHirgW98=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7KLrbZxKtgWM8tvZP8W50nsczWmici4DSc0Iger/ZMvjt4KhZ NdaxH8FIZ5qwF6QCUt4xT9/HATLUSEJKXgqmclpJDlOraKzpX8Iu X-Gm-Gg: ASbGncuUk5mcYJ0unfddt8gAgzwjoTizfp9tQQALmlLw+dttI1gbGOGVkcEo0aXqG2G Mf44W5Ux2A6xxQ4noeke08+Nxi2EzdMHK3k+ksrFPXGM3SCxGguIUX5wQugz509Kv0R/CIkbcwc Xciex9QAFc2NElkquwN0VvweMx906FNQSrt82WyOSjleEd7hbFuOJqewsPHtsPS2tKCmtJN6U/4 pqGc3mZBIDDsHgGMyXXyHyw5XJRkgX0lum73VkAkYVPSCM+axj3FDLss/F0Qrwz+s+/D2F92pGX t2dgct0ruzY01Qn1SH0PsODmvWiSSJdKV0EI0IzaNBjbZ1AVH/VmcbYDXxJqZfBpkeby8kg= X-Google-Smtp-Source: AGHT+IFN3njHf4zlSvRJy82iqOt9EgBaVK0pDLpNl3FfM/NqTtRAx0hFLhBw6GAH1TXoonBsNWdlBA== X-Received: by 2002:a05:6402:2550:b0:5d0:bf4a:3dfe with SMTP id 4fb4d7f45d1cf-5d3be7f01e6mr14645479a12.23.1733823975128; Tue, 10 Dec 2024 01:46:15 -0800 (PST) Received: from corebook.localdomain (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 4fb4d7f45d1cf-5d14b609e56sm7313936a12.40.2024.12.10.01.46.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 01:46:13 -0800 (PST) From: Eric Woudstra To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrew Lunn , Pablo Neira Ayuso , Jozsef Kadlecsik , Jiri Pirko , Ivan Vecera , Roopa Prabhu , Nikolay Aleksandrov , Matthias Brugger , AngeloGioacchino Del Regno , David Ahern , Sebastian Andrzej Siewior , Lorenzo Bianconi , Joe Damato , Alexander Lobakin , Vladimir Oltean , "Frank Wunderlich" , Daniel Golle Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Eric Woudstra Subject: [PATCH RFC v3 net-next 02/13] netfilter: bridge: Add conntrack double vlan and pppoe Date: Tue, 10 Dec 2024 10:44:50 +0100 Message-ID: <20241210094501.3069-3-ericwouds@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241210094501.3069-1-ericwouds@gmail.com> References: <20241210094501.3069-1-ericwouds@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC This adds the capability to conntrack 802.1ad, QinQ, PPPoE and PPPoE-in-Q packets that are passing a bridge. Signed-off-by: Eric Woudstra --- net/bridge/netfilter/nf_conntrack_bridge.c | 88 ++++++++++++++++++---- 1 file changed, 75 insertions(+), 13 deletions(-) diff --git a/net/bridge/netfilter/nf_conntrack_bridge.c b/net/bridge/netfilter/nf_conntrack_bridge.c index 816bb0fde718..31e2bcd71735 100644 --- a/net/bridge/netfilter/nf_conntrack_bridge.c +++ b/net/bridge/netfilter/nf_conntrack_bridge.c @@ -241,56 +241,118 @@ static unsigned int nf_ct_bridge_pre(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { struct nf_hook_state bridge_state = *state; + __be16 outer_proto, inner_proto; enum ip_conntrack_info ctinfo; + int ret, offset = 0; struct nf_conn *ct; - u32 len; - int ret; + u32 len, data_len; ct = nf_ct_get(skb, &ctinfo); if ((ct && !nf_ct_is_template(ct)) || ctinfo == IP_CT_UNTRACKED) return NF_ACCEPT; + switch (skb->protocol) { + case htons(ETH_P_PPP_SES): { + struct ppp_hdr { + struct pppoe_hdr hdr; + __be16 proto; + } *ph = (struct ppp_hdr *)(skb->data); + + data_len = ntohs(ph->hdr.length) - 2; + offset = PPPOE_SES_HLEN; + outer_proto = skb->protocol; + switch (ph->proto) { + case htons(PPP_IP): + inner_proto = htons(ETH_P_IP); + break; + case htons(PPP_IPV6): + inner_proto = htons(ETH_P_IPV6); + break; + default: + return NF_ACCEPT; + } + break; + } + case htons(ETH_P_8021Q): { + struct vlan_hdr *vhdr = (struct vlan_hdr *)(skb->data); + + data_len = 0xffffffff; + offset = VLAN_HLEN; + outer_proto = skb->protocol; + inner_proto = vhdr->h_vlan_encapsulated_proto; + break; + } + default: + data_len = 0xffffffff; + break; + } + + if (offset) { + switch (inner_proto) { + case htons(ETH_P_IP): + case htons(ETH_P_IPV6): + if (!pskb_may_pull(skb, offset)) + return NF_ACCEPT; + skb_pull_rcsum(skb, offset); + skb_reset_network_header(skb); + skb->protocol = inner_proto; + break; + default: + return NF_ACCEPT; + } + } + + ret = NF_ACCEPT; switch (skb->protocol) { case htons(ETH_P_IP): if (!pskb_may_pull(skb, sizeof(struct iphdr))) - return NF_ACCEPT; + goto do_not_track; len = skb_ip_totlen(skb); + if (data_len < len) + len = data_len; if (pskb_trim_rcsum(skb, len)) - return NF_ACCEPT; + goto do_not_track; if (nf_ct_br_ip_check(skb)) - return NF_ACCEPT; + goto do_not_track; bridge_state.pf = NFPROTO_IPV4; ret = nf_ct_br_defrag4(skb, &bridge_state); break; case htons(ETH_P_IPV6): if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) - return NF_ACCEPT; + goto do_not_track; len = sizeof(struct ipv6hdr) + ntohs(ipv6_hdr(skb)->payload_len); + if (data_len < len) + len = data_len; if (pskb_trim_rcsum(skb, len)) - return NF_ACCEPT; + goto do_not_track; if (nf_ct_br_ipv6_check(skb)) - return NF_ACCEPT; + goto do_not_track; bridge_state.pf = NFPROTO_IPV6; ret = nf_ct_br_defrag6(skb, &bridge_state); break; default: nf_ct_set(skb, NULL, IP_CT_UNTRACKED); - return NF_ACCEPT; + goto do_not_track; } - if (ret != NF_ACCEPT) - return ret; + if (ret == NF_ACCEPT) + ret = nf_conntrack_in(skb, &bridge_state); - return nf_conntrack_in(skb, &bridge_state); +do_not_track: + if (offset) { + skb_push_rcsum(skb, offset); + skb_reset_network_header(skb); + skb->protocol = outer_proto; + } + return ret; } - static unsigned int nf_ct_bridge_in(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) {