aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-04-16 03:41:53 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-16 03:41:53 -0400
commitfc54c65853dbfd2f70ff827b73344f9de4e4b501 (patch)
treeeba647feaa75df68b852b2d5d948e5ee5f7dbddf /drivers/net/tun.c
parentd647a591dae06ccc96210cea938aa0342ef935fc (diff)
[TUN]: Allow to register tun devices in namespace.
This is basically means that a net is set for a new device, but actually also involves two more steps: 1. mark the tun device as "local", i.e. do not allow for it to move across namespaces. This is done so, since tun device is most often associated to some file (and thus to some process) and moving the device alone is not valid while keeping the file and the process outside. The need in ability to move a detached persistent device is to be investigated later. 2. get the tun device's net when tun becomes attached and put one when it becomes detached. This is needed to handle the case when a task owning the tun dies, but a files lives for some more time - in this case we must not allow for net to be freed, since its exit hook will spoil that file's private data by unregistering the tun from under tun_chr_close. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 1e655ea63102..d91856b19f6f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -477,6 +477,7 @@ static void tun_setup(struct net_device *dev)
477 dev->stop = tun_net_close; 477 dev->stop = tun_net_close;
478 dev->ethtool_ops = &tun_ethtool_ops; 478 dev->ethtool_ops = &tun_ethtool_ops;
479 dev->destructor = free_netdev; 479 dev->destructor = free_netdev;
480 dev->features |= NETIF_F_NETNS_LOCAL;
480} 481}
481 482
482static struct tun_struct *tun_get_by_name(struct tun_net *tn, const char *name) 483static struct tun_struct *tun_get_by_name(struct tun_net *tn, const char *name)
@@ -544,6 +545,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
544 if (!dev) 545 if (!dev)
545 return -ENOMEM; 546 return -ENOMEM;
546 547
548 dev_net_set(dev, net);
547 tun = netdev_priv(dev); 549 tun = netdev_priv(dev);
548 tun->dev = dev; 550 tun->dev = dev;
549 tun->flags = flags; 551 tun->flags = flags;
@@ -583,6 +585,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
583 585
584 file->private_data = tun; 586 file->private_data = tun;
585 tun->attached = 1; 587 tun->attached = 1;
588 get_net(dev_net(tun->dev));
586 589
587 strcpy(ifr->ifr_name, tun->dev->name); 590 strcpy(ifr->ifr_name, tun->dev->name);
588 return 0; 591 return 0;
@@ -798,6 +801,7 @@ static int tun_chr_close(struct inode *inode, struct file *file)
798 /* Detach from net device */ 801 /* Detach from net device */
799 file->private_data = NULL; 802 file->private_data = NULL;
800 tun->attached = 0; 803 tun->attached = 0;
804 put_net(dev_net(tun->dev));
801 805
802 /* Drop read queue */ 806 /* Drop read queue */
803 skb_queue_purge(&tun->readq); 807 skb_queue_purge(&tun->readq);