diff options
| author | Kusanagi Kouichi <slash@ma.neweb.ne.jp> | 2009-09-16 21:36:13 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-22 14:00:16 -0700 |
| commit | 36989b90879c785f95b877bdcf65a2527dadd893 (patch) | |
| tree | d9ee451eca172d28112e092bac53dca927f98044 /drivers/net/tun.c | |
| parent | 9cc4085585a011179caf86a6408225626f6c2263 (diff) | |
| download | linux-stable-36989b90879c785f95b877bdcf65a2527dadd893.tar.gz linux-stable-36989b90879c785f95b877bdcf65a2527dadd893.tar.bz2 linux-stable-36989b90879c785f95b877bdcf65a2527dadd893.zip | |
tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set.
After commit 2b980dbd77d229eb60588802162c9659726b11f4
("lsm: Add hooks to the TUN driver") tun_set_iff doesn't
return -EINVAL though neither IFF_TUN nor IFF_TAP is set.
Signed-off-by: Kusanagi Kouichi <slash@ma.neweb.ne.jp>
Reviewed-by: Paul Moore <paul.moore@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3f5d28851aa2..e091756166a3 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -946,8 +946,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) char *name; unsigned long flags = 0; - err = -EINVAL; - if (!capable(CAP_NET_ADMIN)) return -EPERM; err = security_tun_dev_create(); @@ -964,7 +962,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) flags |= TUN_TAP_DEV; name = "tap%d"; } else - goto failed; + return -EINVAL; if (*ifr->ifr_name) name = ifr->ifr_name; |