Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kusanagi Kouichi and committed by
David S. Miller
36989b90 9cc40855

+1 -3
+1 -3
drivers/net/tun.c
··· 946 946 char *name; 947 947 unsigned long flags = 0; 948 948 949 - err = -EINVAL; 950 - 951 949 if (!capable(CAP_NET_ADMIN)) 952 950 return -EPERM; 953 951 err = security_tun_dev_create(); ··· 962 964 flags |= TUN_TAP_DEV; 963 965 name = "tap%d"; 964 966 } else 965 - goto failed; 967 + return -EINVAL; 966 968 967 969 if (*ifr->ifr_name) 968 970 name = ifr->ifr_name;