[patch 10/73] VLAN: Lost rtnl_unlock() in vlan_ioctl()

Greg KH
2008-02-06T23:58:50Z

[-- Attachment #1: vlan-lost-rtnl_unlock-in-vlan_ioctl.patch --]
[-- Type: text/plain, Size: 927 bytes --]

2.6.23-stable review patch. If anyone has any objections, please let us know.
------------------
From: Pavel Emelyanov <xemul@openvz.org>

[VLAN]: Lost rtnl_unlock() in vlan_ioctl()

[ Upstream commit: e35de02615f97b785dc6f73cba421cea06bcbd10 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
net/8021q/vlan.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -768,7 +768,7 @@ static int vlan_ioctl_handler(void __use
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;

--