Commit e35de026 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8e71a11c

net/8021q/vlan.c

+1 −1
Original line number Diff line number Diff line
@@ -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;