]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
l2tp: take a reference on sessions used in genetlink handlers
authorGuillaume Nault <g.nault@alphalink.fr>
Fri, 31 Mar 2017 11:02:30 +0000 (13:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 2 Apr 2017 03:16:41 +0000 (20:16 -0700)
commit2777e2ab5a9cf2b4524486c6db1517a6ded25261
tree7143c7c597ae638f5b9587c576824e8aec91523d
parent5e6a9e5a3554a5b3db09cdc22253af1849c65dff
l2tp: take a reference on sessions used in genetlink handlers

Callers of l2tp_nl_session_find() need to hold a reference on the
returned session since there's no guarantee that it isn't going to
disappear from under them.

Relying on the fact that no l2tp netlink message may be processed
concurrently isn't enough: sessions can be deleted by other means
(e.g. by closing the PPPOL2TP socket of a ppp pseudowire).

l2tp_nl_cmd_session_delete() is a bit special: it runs a callback
function that may require a previous call to session->ref(). In
particular, for ppp pseudowires, the callback is l2tp_session_delete(),
which then calls pppol2tp_session_close() and dereferences the PPPOL2TP
socket. The socket might already be gone at the moment
l2tp_session_delete() calls session->ref(), so we need to take a
reference during the session lookup. So we need to pass the do_ref
variable down to l2tp_session_get() and l2tp_session_get_by_ifname().

Since all callers have to be updated, l2tp_session_find_by_ifname() and
l2tp_nl_session_find() are renamed to reflect their new behaviour.

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>
net/l2tp/l2tp_core.c
net/l2tp/l2tp_core.h
net/l2tp/l2tp_netlink.c