Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f663706a authored by Kirill Tkhai's avatar Kirill Tkhai Committed by David S. Miller
Browse files

tun: Do SIOCGSKNS out of rtnl_lock() 



Since net ns of tun device is assigned on the device creation,
and it never changes, we do not need to use any lock to get it
from alive tun.

Signed-off-by: default avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 508c461c

drivers/net/tun.c

+7 −11
Original line number Diff line number Diff line
@@ -2850,10 +2850,10 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 
			    unsigned long arg, int ifreq_len)

{

	struct tun_file *tfile = file->private_data;

	struct net *net = sock_net(&tfile->sk);

	struct tun_struct *tun;

	void __user* argp = (void __user*)arg;

	struct ifreq ifr;

	struct net *net;

	kuid_t owner;

	kgid_t group;

	int sndbuf;
@@ -2877,14 +2877,18 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 
		 */

		return put_user(IFF_TUN | IFF_TAP | TUN_FEATURES,

				(unsigned int __user*)argp);

	} else if (cmd == TUNSETQUEUE)

	} else if (cmd == TUNSETQUEUE) {

		return tun_set_queue(file, &ifr);

	} else if (cmd == SIOCGSKNS) {

		if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

			return -EPERM;

		return open_related_ns(&net->ns, get_net_ns);

	}



	ret = 0;

	rtnl_lock();



	tun = tun_get(tfile);

	net = sock_net(&tfile->sk);

	if (cmd == TUNSETIFF) {

		ret = -EEXIST;

		if (tun)
@@ -2914,14 +2918,6 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, 
		tfile->ifindex = ifindex;

		goto unlock;

	}

	if (cmd == SIOCGSKNS) {

		ret = -EPERM;

		if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

			goto unlock;



		ret = open_related_ns(&net->ns, get_net_ns);

		goto unlock;

	}



	ret = -EBADFD;

	if (!tun)