[RH7,31/32] tun: Add ioctl() TUNGETDEVNETNS cmd to allow obtaining real net ns of tun device

Submitted by Pavel Tikhomirov on June 8, 2020, 5:06 p.m.


Message ID 20200608170602.308872-32-ptikhomirov@virtuozzo.com
State New
Series "port nsfs from vz8"
Headers show

Commit Message

Pavel Tikhomirov June 8, 2020, 5:06 p.m.
From: Kirill Tkhai <ktkhai@virtuozzo.com>

In commit f2780d6d7475 "tun: Add ioctl() SIOCGSKNS cmd to allow
obtaining net ns of tun device" it was missed that tun may change
its net ns, while net ns of socket remains the same as it was
created initially. SIOCGSKNS returns net ns of socket, so it is
not suitable for obtaining net ns of device.

We may have two tun devices with the same names in two net ns,
and in this case it's not possible to determ, which of them
fd refers to (TUNGETIFF will return the same name).

This patch adds new ioctl() cmd for obtaining net ns of a device.

Reported-by: Harald Albrecht <harald.albrecht@gmx.net>
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

(cherry picked from commit 0c3e0e3bb623c3735b8c9ab8aa8332f944f83a9f)


Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
 drivers/net/tun.c           | 8 ++++++++
 include/uapi/linux/if_tun.h | 1 +
 2 files changed, 9 insertions(+)

Patch hide | download patch | download mbox

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 08332bdff1bc..e95a89ba48b7 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -2411,6 +2411,7 @@  static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 	tun_debug(KERN_INFO, tun, "tun_chr_ioctl cmd %u\n", cmd);
+	net = dev_net(tun->dev);
 	ret = 0;
 	switch (cmd) {
@@ -2628,6 +2629,13 @@  static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
 		ret = tun_net_change_carrier(tun->dev, (bool)carrier);
+		ret = -EPERM;
+		if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
+			goto unlock;
+		ret = open_related_ns(&net->ns, get_net_ns);
+		break;
 		ret = -EINVAL;
diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h
index af37bafdc36c..b24812331a17 100644
--- a/include/uapi/linux/if_tun.h
+++ b/include/uapi/linux/if_tun.h
@@ -57,6 +57,7 @@ 
 #define TUNSETVNETBE _IOW('T', 222, int)
 #define TUNGETVNETBE _IOR('T', 223, int)
 #define TUNSETCARRIER _IOW('T', 226, int)
+#define TUNGETDEVNETNS _IO('T', 227)
 /* CONFIG_VE_TUNTAP_ACCOUNTING should be set */
 #define TUNSETACCTID _IOW('T', 300, struct ifreq)