diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-19 16:30:48 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-08 12:01:14 -0800 |
| commit | 1d8782173cb23a56d624b30095dd3e0daaa821c5 (patch) | |
| tree | 69e94edb10570f8e498b37f4e2e55a0792f73c91 /net | |
| parent | 1c8db29a2f48adf8c015e0bca16ff34f2b53a34b (diff) | |
VLAN: Lost rtnl_unlock() in vlan_ioctl()
[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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/8021q/vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index ef3f7898232..21af4417225 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -768,7 +768,7 @@ static int vlan_ioctl_handler(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; |