Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36989b90 authored by Kusanagi Kouichi's avatar Kusanagi Kouichi Committed by David S. Miller
Browse files

tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set. 



After commit 2b980dbd
("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: default avatarKusanagi Kouichi <slash@ma.neweb.ne.jp>
Reviewed-by: default avatarPaul Moore <paul.moore@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9cc40855

drivers/net/tun.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -946,8 +946,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) 
		char *name;

		char *name;

		unsigned long flags = 0;

		unsigned long flags = 0;





		err = -EINVAL;



		if (!capable(CAP_NET_ADMIN))

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

			return -EPERM;

		err = security_tun_dev_create();

		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;

			flags |= TUN_TAP_DEV;

			name = "tap%d";

			name = "tap%d";

		} else

		} else

			goto failed;

			return -EINVAL;





		if (*ifr->ifr_name)

		if (*ifr->ifr_name)

			name = ifr->ifr_name;

			name = ifr->ifr_name;