lkml.org 
[lkml]   [2017]   [Nov]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 060/147] l2tp: hold tunnel while processing genl delete command
    3.2.95-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Guillaume Nault <g.nault@alphalink.fr>

    commit bb0a32ce4389e17e47e198d2cddaf141561581ad upstream.

    l2tp_nl_cmd_tunnel_delete() needs to take a reference on the tunnel, to
    prevent it from being concurrently freed by l2tp_tunnel_destruct().

    Fixes: 309795f4bec2 ("l2tp: Add netlink control API for L2TP")
    Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/l2tp/l2tp_netlink.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/net/l2tp/l2tp_netlink.c
    +++ b/net/l2tp/l2tp_netlink.c
    @@ -184,14 +184,16 @@ static int l2tp_nl_cmd_tunnel_delete(str
    }
    tunnel_id = nla_get_u32(info->attrs[L2TP_ATTR_CONN_ID]);

    - tunnel = l2tp_tunnel_find(net, tunnel_id);
    - if (tunnel == NULL) {
    + tunnel = l2tp_tunnel_get(net, tunnel_id);
    + if (!tunnel) {
    ret = -ENODEV;
    goto out;
    }

    (void) l2tp_tunnel_delete(tunnel);

    + l2tp_tunnel_dec_refcount(tunnel);
    +
    out:
    return ret;
    }
    \
     
     \ /
      Last update: 2017-11-08 20:57    [W:4.076 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site