diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-12-07 01:52:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-07 04:07:55 -0500 |
| commit | e35de02615f97b785dc6f73cba421cea06bcbd10 (patch) | |
| tree | f8568278e81ad7e6176df1a7d1532076956f95a0 /net/8021q | |
| parent | 8e71a11c9f3c09a01fcb445772ffd61b140f2479 (diff) | |
[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>
Diffstat (limited to 'net/8021q')
| -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 6567213959cb..5b183156307a 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) | |||
| 776 | case SET_VLAN_NAME_TYPE_CMD: | 776 | case SET_VLAN_NAME_TYPE_CMD: |
| 777 | err = -EPERM; | 777 | err = -EPERM; |
| 778 | if (!capable(CAP_NET_ADMIN)) | 778 | if (!capable(CAP_NET_ADMIN)) |
| 779 | return -EPERM; | 779 | break; |
| 780 | if ((args.u.name_type >= 0) && | 780 | if ((args.u.name_type >= 0) && |
| 781 | (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) { | 781 | (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) { |
| 782 | vlan_name_type = args.u.name_type; | 782 | vlan_name_type = args.u.name_type; |