netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org, kuba@kernel.org
Subject: [PATCH nf-next 06/15] af_packet: Introduce egress hook
Date: Mon, 18 Oct 2021 00:15:13 +0200	[thread overview]
Message-ID: <20211017221522.853838-7-pablo@netfilter.org> (raw)
In-Reply-To: <20211017221522.853838-1-pablo@netfilter.org>

Add egress hook for AF_PACKET sockets that have the PACKET_QDISC_BYPASS
socket option set to on, which allows packets to escape without being
filtered in the egress path.

This patch only updates the AF_PACKET path, it does not update
dev_direct_xmit() so the XDP infrastructure has a chance to bypass
Netfilter.

[lukas: acquire rcu_read_lock, fix typos, rebase]
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---
 net/packet/af_packet.c | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 2a2bc64f75cf..46943a18a10d 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -91,6 +91,7 @@
 #endif
 #include <linux/bpf.h>
 #include <net/compat.h>
+#include <linux/netfilter_netdev.h>
 
 #include "internal.h"
 
@@ -241,8 +242,42 @@ struct packet_skb_cb {
 static void __fanout_unlink(struct sock *sk, struct packet_sock *po);
 static void __fanout_link(struct sock *sk, struct packet_sock *po);
 
+#ifdef CONFIG_NETFILTER_EGRESS
+static noinline struct sk_buff *nf_hook_direct_egress(struct sk_buff *skb)
+{
+	struct sk_buff *next, *head = NULL, *tail;
+	int rc;
+
+	rcu_read_lock();
+	for (; skb != NULL; skb = next) {
+		next = skb->next;
+		skb_mark_not_on_list(skb);
+
+		if (!nf_hook_egress(skb, &rc, skb->dev))
+			continue;
+
+		if (!head)
+			head = skb;
+		else
+			tail->next = skb;
+
+		tail = skb;
+	}
+	rcu_read_unlock();
+
+	return head;
+}
+#endif
+
 static int packet_direct_xmit(struct sk_buff *skb)
 {
+#ifdef CONFIG_NETFILTER_EGRESS
+	if (nf_hook_egress_active()) {
+		skb = nf_hook_direct_egress(skb);
+		if (!skb)
+			return NET_XMIT_DROP;
+	}
+#endif
 	return dev_direct_xmit(skb, packet_pick_tx_queue(skb));
 }
 
-- 
2.30.2


  parent reply	other threads:[~2021-10-17 22:15 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-17 22:15 [PATCH nf-next 00/15] Netfilter/IPVS updates for net-next Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 01/15] ipvs: add sysctl_run_estimation to support disable estimation Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 02/15] netfilter: nft_dynset: relax superfluous check on set updates Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 03/15] netfilter: Rename ingress hook include file Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 04/15] netfilter: Generalize " Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 05/15] netfilter: Introduce egress hook Pablo Neira Ayuso
2021-10-17 22:15 ` Pablo Neira Ayuso [this message]
2021-10-17 22:15 ` [PATCH nf-next 07/15] netfilter: iptables: allow use of ipt_do_table as hookfn Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 08/15] netfilter: arp_tables: allow use of arpt_do_table " Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 09/15] netfilter: ip6tables: allow use of ip6t_do_table " Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 10/15] netfilter: ebtables: allow use of ebt_do_table " Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 11/15] netfilter: ipvs: prepare for hook function reduction Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 12/15] netfilter: ipvs: remove unneeded output wrappers Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 13/15] netfilter: ipvs: remove unneeded input wrappers Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 14/15] netfilter: ipvs: merge ipv4 + ipv6 icmp reply handlers Pablo Neira Ayuso
2021-10-17 22:15 ` [PATCH nf-next 15/15] netfilter: core: Fix clang warnings about unused static inlines Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211017221522.853838-7-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).