From: "Denis V. Lunev" <den@openvz.org>
To: khorenko@virtuozzo.com
Cc: devel@openvz.org
Subject: [Devel] [PATCH hci-8.1 4/6] ms/ip6: vti: Use ip6_tnl.net in vti6_siocdevprivate().
Date: Tue, 10 Nov 2026 17:31:28 +0100 [thread overview]
Message-ID: <20261110163130.2776687-5-den@openvz.org> (raw)
In-Reply-To: <20261110163130.2776687-1-den@openvz.org>
From: Maoyi Xie <maoyixie.tju@gmail.com>
After patch 1/2 in this series, vti6_update() unlinks and relinks
the tunnel through t->net. vti6_siocdevprivate() still uses
dev_net(dev) for the collision lookup. For a tunnel moved through
IFLA_NET_NS_FD, dev_net(dev) is the new netns, not t->net.
SIOCCHGTUNNEL on a migrated tunnel then runs:
net = dev_net(dev) /* migrated netns */
t = vti6_locate(net, &p1, false) /* misses target in t->net */
...
t = netdev_priv(dev)
vti6_update(t, &p1, false) /* mutates t->net's hash */
A caller in the migrated netns picks params that match a tunnel
in the creation netns. The lookup in dev_net(dev) finds nothing.
vti6_update() prepends the migrated tunnel at the head of the
creation netns hash bucket for those params. Later lookups in
the creation netns resolve to the migrated device. xfrm receive
delivers the matched packets through a device the caller controls.
Reachable from an unprivileged user namespace (unshare --user
--map-root-user --net). Cross tenant scope on container hosts.
Switch the SIOCCHGTUNNEL path on a non fallback device to use
t->net for the lookup. The lookup now matches the netns
vti6_update() operates on.
Also add ns_capable(self->net->user_ns, CAP_NET_ADMIN) before
the lookup. The check at the top of the case is against
dev_net(dev)->user_ns, which after migration is the attacker's
netns. A caller there can pick params absent from self->net,
the lookup returns NULL, t becomes self, and vti6_update()
inserts the device into the creation netns hash. The new check
requires CAP_NET_ADMIN in the creation netns user_ns too.
SIOCADDTUNNEL and SIOCCHGTUNNEL on the fallback device keep
dev_net(dev), which equals init_net there.
Fixes: 61220ab34948 ("vti6: Enable namespace changing")
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Suggested-by: Xiao Liang <shaw.leon@gmail.com>
Cc: stable@vger.kernel.org # v5.15+
Signed-off-by: Maoyi Xie <maoyixie.tju@gmail.com>
Link: https://patch.msgid.link/20260521130555.3421684-3-maoyixie.tju@gmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
(cherry picked from commit 8b484efd5cb4eeef9021a661e198edc5349dacf6)
https://virtuozzo.atlassian.net/browse/VSTOR-154348
Feature: fix ms/net
Signed-off-by: Denis V. Lunev <den@openvz.org>
---
net/ipv6/ip6_vti.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 6cf5d8f01c31..06fa55ddddca 100644
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -841,17 +841,24 @@ vti6_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __user *data
if (p.proto != IPPROTO_IPV6 && p.proto != 0)
break;
vti6_parm_from_user(&p1, &p);
- t = vti6_locate(net, &p1, cmd == SIOCADDTUNNEL);
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;
+ t = vti6_locate(self->net, &p1, false);
if (t) {
if (t->dev != dev) {
err = -EEXIST;
break;
}
} else
- t = netdev_priv(dev);
+ t = self;
err = vti6_update(t, &p1, false);
+ } else {
+ t = vti6_locate(net, &p1, cmd == SIOCADDTUNNEL);
}
if (t) {
err = 0;
--
2.53.0
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
next prev 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 moved into a CT 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 ` Denis V. Lunev [this message]
2026-11-10 16:41 ` [Devel] [PATCH hci-8.1 4/6] ms/ip6: vti: Use ip6_tnl.net in vti6_siocdevprivate() 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 ` [Devel] [PATCH hci-8.1 6/6] net/ip6_vti: fix host panics on a vti6 tunnel moved into a CT Denis V. Lunev
2026-11-10 16:42 ` 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-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.