]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
l2tp: remove useless duplicate session detection in l2tp_netlink
authorGuillaume Nault <g.nault@alphalink.fr>
Tue, 11 Apr 2017 11:12:13 +0000 (13:12 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 11 Apr 2017 17:48:09 +0000 (13:48 -0400)
There's no point in checking for duplicate sessions at the beginning of
l2tp_nl_cmd_session_create(); the ->session_create() callbacks already
return -EEXIST when the session already exists.

Furthermore, even if l2tp_session_find() returns NULL, a new session
might be created right after the test. So relying on ->session_create()
to avoid duplicate session is the only sane behaviour.

Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_netlink.c

index 7e3e669baac42df9d0be2864b927ba4f390258e9..12cfcd0ca807396d18e061e9bcf4c29e760b2563 100644 (file)
@@ -521,11 +521,6 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf
                goto out;
        }
        session_id = nla_get_u32(info->attrs[L2TP_ATTR_SESSION_ID]);
-       session = l2tp_session_find(net, tunnel, session_id);
-       if (session) {
-               ret = -EEXIST;
-               goto out;
-       }
 
        if (!info->attrs[L2TP_ATTR_PEER_SESSION_ID]) {
                ret = -EINVAL;