This reverts commit b823f8df2fcbc936ef228d5eeb419d06df4cc4f7. We switch from procfs ns-files to nsfs ones, so we will apply nsfs version of the patch instead.
https://jira.sw.ru/browse/PSBM-102357 Signed-off-by: Pavel Tikhomirov <[email protected]> --- drivers/net/tun.c | 10 ---------- include/uapi/linux/if_tun.h | 1 - 2 files changed, 11 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index cd91433641c3..c2bebdeab0bc 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2330,7 +2330,6 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, void __user* argp = (void __user*)arg; unsigned int ifindex, carrier; struct ifreq ifr; - struct net *net; kuid_t owner; kgid_t group; int sndbuf; @@ -2407,7 +2406,6 @@ 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) { case TUNGETIFF: @@ -2625,14 +2623,6 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, ret = tun_net_change_carrier(tun->dev, (bool)carrier); break; - case TUNGETDEVNETNS: - ret = -EPERM; - if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) - goto unlock; - - ret = open_net_ns_fd(net); - break; - default: ret = -EINVAL; break; diff --git a/include/uapi/linux/if_tun.h b/include/uapi/linux/if_tun.h index b24812331a17..af37bafdc36c 100644 --- a/include/uapi/linux/if_tun.h +++ b/include/uapi/linux/if_tun.h @@ -57,7 +57,6 @@ #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) -- 2.24.1 _______________________________________________ Devel mailing list [email protected] https://lists.openvz.org/mailman/listinfo/devel
