From: Rongguang Wei <clementwei90@163.com>
To: netdev@vger.kernel.org
Cc: willemdebruijn.kernel@gmail.com, jasowangio@gmail.com,
andrew+netdev@lunn.ch, davem@davemloft.net,
alexei.starovoitov@gmail.com, kuba@kernel.org,
Rongguang Wei <weirongguang@kylinos.cn>
Subject: [PATCH net v11 1/2] tun: run the socket filter from tun_net_xmit()
Date: Thu, 19 Nov 2026 11:22:41 +0800 [thread overview]
Message-ID: <20261119032242.71919-2-clementwei90@163.com> (raw)
In-Reply-To: <20261119032242.71919-1-clementwei90@163.com>
From: Rongguang Wei <weirongguang@kylinos.cn>
TUNATTACHFILTER copies only the sock_fprog header, so tun->fprog.filter
points into the address space of the process that issued the ioctl, and
tun_attach() reads it again whenever a queue is attached to a persistent
device. That read can fail, and with the inverted check below the
failure was not fatal either: the queue was attached without a filter,
while a successful read returned early and left the queue unpublished.
Keep the program on the device instead: TUNATTACHFILTER builds it once
with bpf_prog_create_from_user() and stores it in tun->cbpf_prog, and
tun_net_xmit() runs it from there. A per-queue flag records whether the
queue was attached with IFF_NOFILTER, so a queue attached later does not
depend on the caller's buffer at all.
The inverted check was discovered by manual code inspection first.
Fixes: 54f968d6efdb ("tuntap: move socket to tun_file")
Suggested-by: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: Rongguang Wei <weirongguang@kylinos.cn>
---
drivers/net/tun.c | 93 ++++++++++++++++++++++-------------------------
1 file changed, 43 insertions(+), 50 deletions(-)
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 86fd44e107550..b599a8932f027 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -135,6 +135,7 @@ struct tun_file {
struct fasync_struct *fasync;
/* only used for fasnyc */
unsigned int flags;
+ bool nofilter; /* attached with IFF_NOFILTER */
union {
u16 queue_index;
unsigned int ifindex;
@@ -176,8 +177,8 @@ struct tun_prog {
};
/* Since the socket were moved to tun_file, to preserve the behavior of persist
- * device, socket filter, sndbuf and vnet header size were restore when the
- * file were attached to a persist device.
+ * device, sndbuf and vnet header size were restore when the file were attached
+ * to a persist device.
*/
struct tun_struct {
struct tun_file __rcu *tfiles[MAX_TAP_QUEUES];
@@ -196,9 +197,7 @@ struct tun_struct {
int vnet_hdr_sz;
int sndbuf;
struct tap_filter txflt;
- struct sock_fprog fprog;
- /* protected by rtnl lock */
- bool filter_attached;
+ struct sock_fprog fprog; /* header, for TUNGETFILTER */
u32 msg_enable;
spinlock_t lock;
struct hlist_head flows[TUN_NUM_FLOW_ENTRIES];
@@ -213,6 +212,7 @@ struct tun_struct {
struct bpf_prog __rcu *xdp_prog;
struct tun_prog __rcu *steering_prog;
struct tun_prog __rcu *filter_prog;
+ struct tun_prog __rcu *cbpf_prog; /* from TUNATTACHFILTER */
struct ethtool_link_ksettings link_ksettings;
/* init args */
struct file *file;
@@ -731,7 +731,7 @@ static void tun_force_wake_queue(struct tun_struct *tun,
}
static int tun_attach(struct tun_struct *tun, struct file *file,
- bool skip_filter, bool napi, bool napi_frags,
+ bool nofilter, bool napi, bool napi_frags,
bool publish_tun)
{
struct tun_file *tfile = file->private_data;
@@ -757,15 +757,6 @@ static int tun_attach(struct tun_struct *tun, struct file *file,
err = 0;
- /* Re-attach the filter to persist device */
- if (!skip_filter && (tun->filter_attached == true)) {
- lock_sock(tfile->socket.sk);
- err = sk_attach_filter(&tun->fprog, tfile->socket.sk);
- release_sock(tfile->socket.sk);
- if (!err)
- goto out;
- }
-
if (!tfile->detached &&
ptr_ring_resize(&tfile->tx_ring, dev->tx_queue_len,
GFP_KERNEL, tun_ptr_free)) {
@@ -819,6 +810,7 @@ static int tun_attach(struct tun_struct *tun, struct file *file,
* initialized tfile; otherwise we risk using half-initialized
* object.
*/
+ WRITE_ONCE(tfile->nofilter, nofilter);
if (publish_tun)
rcu_assign_pointer(tfile->tun, tun);
rcu_assign_pointer(tun->tfiles[tun->numqueues], tfile);
@@ -1071,6 +1063,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
int txq = skb->queue_mapping;
struct netdev_queue *queue;
struct tun_file *tfile;
+ struct tun_prog *prog;
int len = skb->len;
int ret;
@@ -1096,10 +1089,20 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
goto drop;
}
- if (tfile->socket.sk->sk_filter) {
- drop_reason = sk_filter_reason(tfile->socket.sk, skb);
- if (drop_reason)
+ /* Classic filter set with TUNATTACHFILTER. A queue attached with
+ * IFF_NOFILTER does not run it.
+ */
+ prog = rcu_dereference(tun->cbpf_prog);
+ if (prog && !READ_ONCE(tfile->nofilter)) {
+ /* A filter returning 0 drops the packet, any other value is
+ * the length to keep. pskb_trim() does nothing when that
+ * length is larger than the skb.
+ */
+ len = bpf_prog_run_clear_cb(prog->prog, skb);
+ if (!len || pskb_trim(skb, len)) {
+ drop_reason = SKB_DROP_REASON_SOCKET_FILTER;
goto drop;
+ }
}
len = run_ebpf_filter(tun, skb, len);
@@ -2417,6 +2420,7 @@ static void tun_free_netdev(struct net_device *dev)
security_tun_dev_free_security(tun->security);
__tun_set_ebpf(tun, &tun->steering_prog, NULL);
__tun_set_ebpf(tun, &tun->filter_prog, NULL);
+ __tun_set_ebpf(tun, &tun->cbpf_prog, NULL);
}
static void tun_setup(struct net_device *dev)
@@ -2975,7 +2979,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);
tun->align = NET_SKB_PAD;
- tun->filter_attached = false;
tun->sndbuf = tfile->socket.sk->sk_sndbuf;
tun->rx_batched = 0;
RCU_INIT_POINTER(tun->steering_prog, NULL);
@@ -3079,39 +3082,34 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
return 0;
}
-static void tun_detach_filter(struct tun_struct *tun, int n)
+static int tun_attach_filter(struct tun_struct *tun, void __user *data)
{
- int i;
+ struct sock_fprog fprog;
struct tun_file *tfile;
+ struct bpf_prog *prog;
+ int i, ret;
- for (i = 0; i < n; i++) {
- tfile = rtnl_dereference(tun->tfiles[i]);
- lock_sock(tfile->socket.sk);
- sk_detach_filter(tfile->socket.sk);
- release_sock(tfile->socket.sk);
- }
+ if (copy_from_user(&fprog, data, sizeof(fprog)))
+ return -EFAULT;
- tun->filter_attached = false;
-}
+ ret = bpf_prog_create_from_user(&prog, &fprog, NULL, false);
+ if (ret)
+ return ret;
-static int tun_attach_filter(struct tun_struct *tun)
-{
- int i, ret = 0;
- struct tun_file *tfile;
+ ret = __tun_set_ebpf(tun, &tun->cbpf_prog, prog);
+ if (ret) {
+ bpf_prog_destroy(prog);
+ return ret;
+ }
for (i = 0; i < tun->numqueues; i++) {
tfile = rtnl_dereference(tun->tfiles[i]);
- lock_sock(tfile->socket.sk);
- ret = sk_attach_filter(&tun->fprog, tfile->socket.sk);
- release_sock(tfile->socket.sk);
- if (ret) {
- tun_detach_filter(tun, i);
- return ret;
- }
+ WRITE_ONCE(tfile->nofilter, false);
}
- tun->filter_attached = true;
- return ret;
+ /* Only TUNGETFILTER reads it */
+ tun->fprog = fprog;
+ return 0;
}
static void tun_set_sndbuf(struct tun_struct *tun)
@@ -3307,7 +3305,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
if (tfile->detached)
ifr.ifr_flags |= IFF_DETACH_QUEUE;
- if (!tfile->socket.sk->sk_filter)
+ if (tfile->nofilter || !rcu_access_pointer(tun->cbpf_prog))
ifr.ifr_flags |= IFF_NOFILTER;
if (copy_to_user(argp, &ifr, ifreq_len))
@@ -3454,11 +3452,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
ret = -EINVAL;
if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
break;
- ret = -EFAULT;
- if (copy_from_user(&tun->fprog, argp, sizeof(tun->fprog)))
- break;
-
- ret = tun_attach_filter(tun);
+ ret = tun_attach_filter(tun, argp);
break;
case TUNDETACHFILTER:
@@ -3466,8 +3460,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
ret = -EINVAL;
if ((tun->flags & TUN_TYPE_MASK) != IFF_TAP)
break;
- ret = 0;
- tun_detach_filter(tun, tun->numqueues);
+ ret = __tun_set_ebpf(tun, &tun->cbpf_prog, NULL);
break;
case TUNGETFILTER:
--
2.43.0
No virus found
Checked by Hillstone Network AntiVirus
next prev parent reply other threads:[~2026-11-19 3:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 3:22 [PATCH net v11 0/2] tun: fix re-attaching the socket filter Rongguang Wei
2026-11-19 3:22 ` Rongguang Wei [this message]
2026-11-19 3:47 ` [PATCH net v11 1/2] tun: run the socket filter from tun_net_xmit() Alexei Starovoitov
2026-11-19 5:42 ` Rongguang Wei
2026-11-19 6:18 ` Alexei Starovoitov
2026-11-19 6:51 ` Rongguang Wei
2026-11-19 3:22 ` [PATCH net v11 2/2] selftests: net: add TAP socket filter attach tests Rongguang Wei
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=20261119032242.71919-2-clementwei90@163.com \
--to=clementwei90@163.com \
--cc=alexei.starovoitov@gmail.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=jasowangio@gmail.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=weirongguang@kylinos.cn \
--cc=willemdebruijn.kernel@gmail.com \
/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