Skip to content

more l2tp locking and ordering fixes

Giuliano Procida stable 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest27 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/27l2tp: lock socket before checking flags in connect()include/net/ipv6.h net/ipv6/datagram.c net/l2tp/l2tp_ip.c +1 more+28 -130 replies
2/27l2tp: fix racy socket lookup in l2tp_ip and l2tp_ip6 bind()net/l2tp/l2tp_ip.c net/l2tp/l2tp_ip6.c+32 -380 replies
3/27l2tp: hold session while sending creation notificationsnet/l2tp/l2tp_netlink.c+4 -20 replies
4/27l2tp: take a reference on sessions used in genetlink handlersnet/l2tp/l2tp_core.c net/l2tp/l2tp_core.h net/l2tp/l2tp_netlink.c+35 -160 replies
5/27l2tp: don't use l2tp_tunnel_find() in l2tp_ip and l2tp_ip6net/l2tp/l2tp_ip.c net/l2tp/l2tp_ip6.c+16 -290 replies
6/27net: l2tp: export debug flags to UAPIinclude/uapi/linux/l2tp.h net/l2tp/l2tp_core.h+16 -110 replies
7/27net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_*Documentation/networking/l2tp.txt include/uapi/linux/if_pppol2tp.h+10 -111 reply
8/27net: l2tp: ppp: change PPPOL2TP_MSG_* => L2TP_MSG_*net/l2tp/l2tp_ppp.c+27 -270 replies
9/27New kernel function to get IP overhead on a socket.include/linux/net.h net/socket.c+49 -00 replies
10/27L2TP:Adjust intf MTU, add underlay L3, L2 hdrs.net/l2tp/l2tp_eth.c+51 -40 replies
11/27l2tp: remove useless duplicate session detection in l2tp_netlinknet/l2tp/l2tp_netlink.c+0 -50 replies
12/27l2tp: remove l2tp_session_find()net/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+1 -530 replies
13/27l2tp: define parameters of l2tp_session_get*() as "const"net/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+7 -50 replies
14/27l2tp: define parameters of l2tp_tunnel_find*() as "const"net/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+4 -40 replies
15/27l2tp: initialise session's refcount before making it reachablenet/l2tp/l2tp_core.c+2 -40 replies
16/27l2tp: hold tunnel while looking up sessions in l2tp_netlinknet/l2tp/l2tp_core.c net/l2tp/l2tp_core.h net/l2tp/l2tp_netlink.c+38 -470 replies
17/27l2tp: hold tunnel while processing genl delete commandnet/l2tp/l2tp_netlink.c+4 -20 replies
18/27l2tp: hold tunnel while handling genl tunnel updatesnet/l2tp/l2tp_netlink.c+4 -20 replies
19/27l2tp: hold tunnel while handling genl TUNNEL_GET commandsnet/l2tp/l2tp_netlink.c+15 -120 replies
20/27l2tp: hold tunnel used while creating sessions with netlinknet/l2tp/l2tp_netlink.c+12 -90 replies
21/27l2tp: prevent creation of sessions on terminated tunnelsnet/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+32 -130 replies
22/27l2tp: pass tunnel pointer to ->session_create()net/l2tp/l2tp_core.h net/l2tp/l2tp_eth.c net/l2tp/l2tp_netlink.c +1 more+17 -250 replies
23/27l2tp: fix l2tp_eth module loadingnet/l2tp/l2tp_eth.c+2 -490 replies
24/27l2tp: don't register sessions in l2tp_session_create()net/l2tp/l2tp_core.c net/l2tp/l2tp_core.h net/l2tp/l2tp_eth.c +1 more+36 -200 replies
25/27l2tp: initialise l2tp_eth sessions before registering themnet/l2tp/l2tp_eth.c+76 -320 replies
26/27l2tp: protect sock pointer of struct pppol2tp_session with RCUnet/l2tp/l2tp_ppp.c+101 -530 replies
27/27l2tp: initialise PPP sessions before registering themnet/l2tp/l2tp_ppp.c+38 -310 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [PATCH 00/27] more l2tp locking and ordering fixes

Hi Greg.

This is for 4.4.

This is a follow-up to "l2tp locking and ordering fixes" for 4.9.

Compared with that series, this pulls in 5 more patches (the first 5 Guillaume Nault ones below) containing more of the same as well as making later changes apply more cleanly.

As before, every commit compiles with make allmodconfig, but I have no hardware to test this with.

9dd79945b0f8 (use IS_ENABLED) would have made one patch or so cleaner but I didn't add it.

There are also bunch of fixes that aren't l2tp locking or ordering fixes and I didn't add them either. For the record...

Between 4.4 and 4.9:

018f82585823 net: l2tp: fix reversed udp6 checksum flags 56cff471d0c6 l2tp: Fix the connect status check in pppol2tp_getname 286c72deabaa udp: must lock the socket in udp_disconnect() df90e6886146 l2tp: fix lookup for sockets not bound to a device in l2tp_ip 31e2f21fb35b l2tp: fix address test in __l2tp_ip6_bind_lookup()

Between 4.9 and 4.9.latest:

000224c1106c l2tp: consider '::' as wildcard address in l2tp_ip6 socket lookup d2d74d0e58b2 l2tp: take remote address into account in l2tp_ip and l2tp_ip6 socket lookups 65b05d03a578 l2tp: remove configurable payload offset
b437ed583592 l2tp: Fix possible NULL pointer dereference

Regards,
Giuliano.

Asbjørn Sloth Tønnesen (3):
net: l2tp: export debug flags to UAPI
net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_*
net: l2tp: ppp: change PPPOL2TP_MSG_* => L2TP_MSG_*

Guillaume Nault (22):
l2tp: lock socket before checking flags in connect()
l2tp: fix racy socket lookup in l2tp_ip and l2tp_ip6 bind()
l2tp: hold session while sending creation notifications
l2tp: take a reference on sessions used in genetlink handlers
l2tp: don't use l2tp_tunnel_find() in l2tp_ip and l2tp_ip6
l2tp: remove useless duplicate session detection in l2tp_netlink
l2tp: remove l2tp_session_find()
l2tp: define parameters of l2tp_session_get*() as "const"
l2tp: define parameters of l2tp_tunnel_find*() as "const"
l2tp: initialise session's refcount before making it reachable
l2tp: hold tunnel while looking up sessions in l2tp_netlink
l2tp: hold tunnel while processing genl delete command
l2tp: hold tunnel while handling genl tunnel updates
l2tp: hold tunnel while handling genl TUNNEL_GET commands
l2tp: hold tunnel used while creating sessions with netlink
l2tp: prevent creation of sessions on terminated tunnels
l2tp: pass tunnel pointer to ->session_create()
l2tp: fix l2tp_eth module loading
l2tp: don't register sessions in l2tp_session_create()
l2tp: initialise l2tp_eth sessions before registering them
l2tp: protect sock pointer of struct pppol2tp_session with RCU
l2tp: initialise PPP sessions before registering them

R. Parameswaran (2):
New kernel function to get IP overhead on a socket. L2TP:Adjust intf MTU, add underlay L3, L2 hdrs.

 Documentation/networking/l2tp.txt |   8 +-
 include/linux/net.h               |   3 +
 include/net/ipv6.h                |   2 +
 include/uapi/linux/if_pppol2tp.h  |  13 +-
 include/uapi/linux/l2tp.h         |  17 +-
 net/ipv6/datagram.c               |   4 +-
 net/l2tp/l2tp_core.c              | 181 ++++++-----------
 net/l2tp/l2tp_core.h              |  47 +++--
 net/l2tp/l2tp_eth.c               | 214 +++++++++++++--------
 net/l2tp/l2tp_ip.c                |  68 ++++---
 net/l2tp/l2tp_ip6.c               |  82 ++++----
 net/l2tp/l2tp_netlink.c           | 124 +++++++-----
 net/l2tp/l2tp_ppp.c               | 309 ++++++++++++++++++------------
 net/socket.c                      |  46 +++++
 14 files changed, 629 insertions(+), 489 deletions(-)
Signature · 1 line
2.27.0.rc0.183.gde8f92d652-goog