summaryrefslogtreecommitdiff
path: root/net/8021q
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-12-07 09:52:16 +0300
committerDavid S. Miller <davem@sunset.davemloft.net>2007-12-07 12:07:55 +0300
commite35de02615f97b785dc6f73cba421cea06bcbd10 (patch)
treef8568278e81ad7e6176df1a7d1532076956f95a0 /net/8021q
parent8e71a11c9f3c09a01fcb445772ffd61b140f2479 (diff)
downloadlinux-e35de02615f97b785dc6f73cba421cea06bcbd10.tar.xz
[VLAN]: Lost rtnl_unlock() in vlan_ioctl()
The SET_VLAN_NAME_TYPE_CMD command w/o CAP_NET_ADMIN capability doesn't release the rtnl lock. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r--net/8021q/vlan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 6567213959cb..5b183156307a 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -776,7 +776,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
case SET_VLAN_NAME_TYPE_CMD:
err = -EPERM;
if (!capable(CAP_NET_ADMIN))
- return -EPERM;
+ break;
if ((args.u.name_type >= 0) &&
(args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
vlan_name_type = args.u.name_type;