commit e35de02615f97b785dc6f73cba421cea06bcbd10
author Pavel Emelyanov <xemul@openvz.org> Thu Dec 06 22:52:16 2007 -0800
committer David S. Miller <davem@sunset.davemloft.net> Fri Dec 07 01:07:55 2007 -0800
tree f8568278e81ad7e6176df1a7d1532076956f95a0
parent 8e71a11c9f3c09a01fcb445772ffd61b140f2479

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

net/8021q/vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 6567213..5b18315 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -776,7 +776,7 @@
 	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;