]> git.baikalelectronics.ru Git - kernel.git/commit
l2tp: hold reference on tunnels printed in pppol2tp proc file
authorGuillaume Nault <g.nault@alphalink.fr>
Thu, 12 Apr 2018 18:50:34 +0000 (20:50 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 13 Apr 2018 16:17:26 +0000 (12:17 -0400)
commit9fbc82cca596284bcc9f21ed459b8e91d03c118e
tree4a6b39a662e8f76bdc67369e2e638d0e054cace3
parent99911827d73e8718b2762d98e53817c37e72748f
l2tp: hold reference on tunnels printed in pppol2tp proc file

Use l2tp_tunnel_get_nth() instead of l2tp_tunnel_find_nth(), to be safe
against concurrent tunnel deletion.

Unlike sessions, we can't drop the reference held on tunnels in
pppol2tp_seq_show(). Tunnels are reused across several calls to
pppol2tp_seq_start() when iterating over sessions. These iterations
need the tunnel for accessing the next session. Therefore the only safe
moment for dropping the reference is just before searching for the next
tunnel.

Normally, the last invocation of pppol2tp_next_tunnel() doesn't find
any new tunnel, so it drops the last tunnel without taking any new
reference. However, in case of error, pppol2tp_seq_stop() is called
directly, so we have to drop the reference there.

Fixes: b2079113577e ("l2tp: Split pppol2tp patch into separate l2tp and ppp parts")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_ppp.c