diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-22 03:06:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-22 03:06:42 +0300 |
| commit | e2a7c34fb2856fd5306e307e170e3dde358d0dce (patch) | |
| tree | afeb300b04186b1a1f649b2cd8a401a75878297c /drivers/net/tun.c | |
| parent | 7d3f0cd43feea1636dd7746f22fe8249b34d1b79 (diff) | |
| parent | 6470812e22261d2342ef1597be62e63a0423d691 (diff) | |
| download | linux-e2a7c34fb2856fd5306e307e170e3dde358d0dce.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 19cbbbb1b63b..06e8f0bb2dab 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2079,6 +2079,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) err_detach: tun_detach_all(dev); + /* register_netdevice() already called tun_free_netdev() */ + goto err_free_dev; + err_free_flow: tun_flow_uninit(tun); security_tun_dev_free_security(tun->security); |