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

Commit 9aad77c3 authored by Nicolas Dichtel's avatar Nicolas Dichtel Committed by David S. Miller
Browse files

sit: use the right netns in ioctl handler 



Because the netdevice may be in another netns than the i/o netns, we should
use the i/o netns instead of dev_net(dev).

Note that netdev_priv(dev) cannot bu NULL, hence we can remove these useless
checks.

Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c923ce2

net/ipv6/sit.c

+4 −13
Original line number Diff line number Diff line
@@ -1127,8 +1127,8 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) 
	int err = 0;

	struct ip_tunnel_parm p;

	struct ip_tunnel_prl prl;

	struct ip_tunnel *t;

	struct net *net = dev_net(dev);

	struct ip_tunnel *t = netdev_priv(dev);

	struct net *net = t->net;

	struct sit_net *sitn = net_generic(net, sit_net_id);

#ifdef CONFIG_IPV6_SIT_6RD

	struct ip_tunnel_6rd ip6rd;
@@ -1139,16 +1139,15 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) 
#ifdef CONFIG_IPV6_SIT_6RD

	case SIOCGET6RD:

#endif

		t = NULL;

		if (dev == sitn->fb_tunnel_dev) {

			if (copy_from_user(&p, ifr->ifr_ifru.ifru_data, sizeof(p))) {

				err = -EFAULT;

				break;

			}

			t = ipip6_tunnel_locate(net, &p, 0);

		}

			if (t == NULL)

				t = netdev_priv(dev);

		}



		err = -EFAULT;

		if (cmd == SIOCGETTUNNEL) {
@@ -1244,9 +1243,6 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) 
		err = -EINVAL;

		if (dev == sitn->fb_tunnel_dev)

			goto done;

		err = -ENOENT;

		if (!(t = netdev_priv(dev)))

			goto done;

		err = ipip6_tunnel_get_prl(t, ifr->ifr_ifru.ifru_data);

		break;
@@ -1262,9 +1258,6 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) 
		err = -EFAULT;

		if (copy_from_user(&prl, ifr->ifr_ifru.ifru_data, sizeof(prl)))

			goto done;

		err = -ENOENT;

		if (!(t = netdev_priv(dev)))

			goto done;



		switch (cmd) {

		case SIOCDELPRL:
@@ -1292,8 +1285,6 @@ ipip6_tunnel_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) 
				   sizeof(ip6rd)))

			goto done;



		t = netdev_priv(dev);



		if (cmd != SIOCDEL6RD) {

			err = ipip6_tunnel_update_6rd(t, &ip6rd);

			if (err < 0)