Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e35de02615f97b785dc6f73cba421cea06bcbd10
Commit:     e35de02615f97b785dc6f73cba421cea06bcbd10
Parent:     8e71a11c9f3c09a01fcb445772ffd61b140f2479
Author:     Pavel Emelyanov <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 6 22:52:16 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Fri Dec 7 01:07:55 2007 -0800

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 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 6567213..5b18315 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)
        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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to