From d944f6a2f624a9c5098e7feced9869298533e615 Mon Sep 17 00:00:00 2001 From: Kusanagi Kouichi Date: Wed, 16 Sep 2009 21:36:13 +0000 Subject: [PATCH] --- yaml --- r: 166240 b: refs/heads/master c: 36989b90879c785f95b877bdcf65a2527dadd893 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tun.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f76e4c0b4c9f..7917057aa8a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cc4085585a011179caf86a6408225626f6c2263 +refs/heads/master: 36989b90879c785f95b877bdcf65a2527dadd893 diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index 3f5d28851aa2..e091756166a3 100644 --- a/trunk/drivers/net/tun.c +++ b/trunk/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;