* tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set.
@ 2009-09-17 7:36 Kusanagi Kouichi
2009-09-18 11:54 ` Paul Moore
0 siblings, 1 reply; 3+ messages in thread
From: Kusanagi Kouichi @ 2009-09-17 7:36 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
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>
---
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 3f5d288..e091756 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;
--
1.6.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set.
2009-09-17 7:36 tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set Kusanagi Kouichi
@ 2009-09-18 11:54 ` Paul Moore
2009-09-22 21:26 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Paul Moore @ 2009-09-18 11:54 UTC (permalink / raw)
To: Kusanagi Kouichi; +Cc: netdev, linux-kernel
On Thursday 17 September 2009 03:36:13 am Kusanagi Kouichi wrote:
> 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>
Sorry about that, my mistake, thanks for finding and fixing this.
Reviewed-by: Paul Moore <paul.moore@hp.com>
> ---
> 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 3f5d288..e091756 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;
>
--
paul moore
linux @ hp
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set.
2009-09-18 11:54 ` Paul Moore
@ 2009-09-22 21:26 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-09-22 21:26 UTC (permalink / raw)
To: paul.moore; +Cc: slash, netdev, linux-kernel
From: Paul Moore <paul.moore@hp.com>
Date: Fri, 18 Sep 2009 07:54:05 -0400
> On Thursday 17 September 2009 03:36:13 am Kusanagi Kouichi wrote:
>> 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>
>
> Sorry about that, my mistake, thanks for finding and fixing this.
>
> Reviewed-by: Paul Moore <paul.moore@hp.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-09-22 21:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-17 7:36 tun: Return -EINVAL if neither IFF_TUN nor IFF_TAP is set Kusanagi Kouichi
2009-09-18 11:54 ` Paul Moore
2009-09-22 21:26 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).