From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 7 Dec 2007 06:52:16 +0000 (-0800)
Subject: [VLAN]: Lost rtnl_unlock() in vlan_ioctl()
X-Git-Tag: v2.6.24-rc5~52^2~1
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e35de02615f97b785dc6f73cba421cea06bcbd10;p=linux-2.6

[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>
---

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 6567213959..5b18315630 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;