OpenVZ / Virtuozzo kernel development (devel@openvz.org)
 help / color / mirror / Atom feed
From: "Denis V. Lunev" <den@openvz.org>
To: khorenko@virtuozzo.com
Cc: devel@openvz.org
Subject: [Devel] [PATCH hci-8.1 6/6] net/ip6_vti: fix host panics on a vti6 tunnel moved into a CT
Date: Tue, 10 Nov 2026 17:31:30 +0100	[thread overview]
Message-ID: <20261110163130.2776687-7-den@openvz.org> (raw)
In-Reply-To: <20261110163130.2776687-1-den@openvz.org>

From: Denis V. Lunev <den@openvz.org>

vti6_init_net() frees the vti6_net of every container netns. vti6
tunnels cannot be created in a container, but the host can move one in
with "ip link set v6 netns <CT>". vti6_dellink() and
vti6_siocdevprivate() look ip6n up in dev_net(dev) and read
ip6n->fb_tnl_dev, so the node panics on a NULL pointer dereference when
container root deletes the tunnel or issues a tunnel ioctl on it, when
the container stops and cleanup_net() deletes it, or when ip6_vti is
unloaded. SIOCADDTUNNEL on such a device also walks the NULL hash in
vti6_locate().

Take the netns from t->net in both, as ip6_tunnel and sit do. For a
tunnel that was not moved t->net is dev_net(dev), so the host sees no
change. For a moved one the CAP_NET_ADMIN checks of the ioctls now run
against the creation netns and container root gets EPERM, as it does
for ip6tnl and sit; "ip link del" keeps working.

This relies on the backports of mainline 11b326fb0a37 ("ip6: vti: Use
ip6_tnl.net in vti6_changelink()."), which moves vti6_changelink() and
vti6_update() to t->net, and d289d5307762 ("ip6_vti: set
netns_immutable on the fallback device."), which keeps ip6_vti0 in its
netns so the fb_tnl_dev comparisons keep their meaning.

Fixes: b03d021d2fd6 ("ve/net: ip6_vti: skip per net init in ve")

https://virtuozzo.atlassian.net/browse/VSTOR-154348
Feature: net: whitelist allowed Container network devices
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
 net/ipv6/ip6_vti.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 420830c5e064..40c6298c8b13 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -805,8 +805,9 @@ vti6_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __user *data
 	int err = 0;
 	struct ip6_tnl_parm2 p;
 	struct __ip6_tnl_parm p1;
+	struct ip6_tnl *self = netdev_priv(dev);
 	struct ip6_tnl *t = NULL;
-	struct net *net = dev_net(dev);
+	struct net *net = self->net;
 	struct vti6_net *ip6n = net_generic(net, vti6_net_id);
 
 	memset(&p1, 0, sizeof(p1));
@@ -842,8 +843,6 @@ vti6_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __user *data
 			break;
 		vti6_parm_from_user(&p1, &p);
 		if (dev != ip6n->fb_tnl_dev && cmd == SIOCCHGTUNNEL) {
-			struct ip6_tnl *self = netdev_priv(dev);
-
 			err = -EPERM;
 			if (!ns_capable(self->net->user_ns, CAP_NET_ADMIN))
 				break;
@@ -1034,8 +1033,8 @@ static int vti6_newlink(struct net *src_net, struct net_device *dev,
 
 static void vti6_dellink(struct net_device *dev, struct list_head *head)
 {
-	struct net *net = dev_net(dev);
-	struct vti6_net *ip6n = net_generic(net, vti6_net_id);
+	struct ip6_tnl *t = netdev_priv(dev);
+	struct vti6_net *ip6n = net_generic(t->net, vti6_net_id);
 
 	if (dev != ip6n->fb_tnl_dev)
 		unregister_netdevice_queue(dev, head);
-- 
2.53.0

_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel

  parent reply	other threads:[~2026-11-10 16:33 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10 16:31 [Devel] [PATCH hci-8.1 0/6] net/ipv6: fix host panics on tunnels " Denis V. Lunev
2026-11-10 16:31 ` [Devel] [PATCH hci-8.1 1/6] net/ip6_tunnel: fix a host panic deleting ip6tnl moved into a CT without ipip Denis V. Lunev
2026-11-10 16:35   ` no-reply
2026-11-12 13:01   ` Konstantin Khorenko
2026-11-10 16:31 ` [Devel] [PATCH hci-8.1 2/6] net/sit: fix a host panic deleting sit moved into a CT without sit Denis V. Lunev
2026-11-10 16:36   ` no-reply
2026-11-12 13:01   ` Konstantin Khorenko
2026-11-10 16:31 ` [Devel] [PATCH hci-8.1 3/6] ms/ip6: vti: Use ip6_tnl.net in vti6_changelink() Denis V. Lunev
2026-11-10 16:38   ` no-reply
2026-11-12 13:01   ` Konstantin Khorenko
2026-11-10 16:31 ` [Devel] [PATCH hci-8.1 4/6] ms/ip6: vti: Use ip6_tnl.net in vti6_siocdevprivate() Denis V. Lunev
2026-11-10 16:41   ` no-reply
2026-11-12 13:01   ` Konstantin Khorenko
2026-11-10 16:31 ` [Devel] [PATCH hci-8.1 5/6] ms/ip6_vti: set netns_immutable on the fallback device Denis V. Lunev
2026-11-10 16:41   ` no-reply
2026-11-12 13:01   ` Konstantin Khorenko
2026-11-10 16:31 ` Denis V. Lunev [this message]
2026-11-10 16:42   ` [Devel] [PATCH hci-8.1 6/6] net/ip6_vti: fix host panics on a vti6 tunnel moved into a CT no-reply
2026-11-12 13:01   ` Konstantin Khorenko
2026-11-12 13:01 ` [Devel] [PATCH hci-8.1 0/6] net/ipv6: fix host panics on tunnels " Konstantin Khorenko
2026-11-12 13:01 ` Konstantin Khorenko

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=20261110163130.2776687-7-den@openvz.org \
    --to=den@openvz.org \
    --cc=devel@openvz.org \
    --cc=khorenko@virtuozzo.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