aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 961fad1f7053..f3a454c3295a 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -358,6 +358,8 @@ static void tun_free_netdev(struct net_device *dev)
358{ 358{
359 struct tun_struct *tun = netdev_priv(dev); 359 struct tun_struct *tun = netdev_priv(dev);
360 360
361 BUG_ON(!test_bit(SOCK_EXTERNALLY_ALLOCATED, &tun->socket.flags));
362
361 sk_release_kernel(tun->socket.sk); 363 sk_release_kernel(tun->socket.sk);
362} 364}
363 365
@@ -1115,6 +1117,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
1115 tun->flags = flags; 1117 tun->flags = flags;
1116 tun->txflt.count = 0; 1118 tun->txflt.count = 0;
1117 tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr); 1119 tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);
1120 set_bit(SOCK_EXTERNALLY_ALLOCATED, &tun->socket.flags);
1118 1121
1119 err = -ENOMEM; 1122 err = -ENOMEM;
1120 sk = sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL, &tun_proto); 1123 sk = sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL, &tun_proto);