Skip to content

l2tp locking and ordering fixes

Giuliano Procida stable 2 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest22 patches 1 replyIn review
  2. v122 patches 0 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/22net: l2tp: export debug flags to UAPIinclude/uapi/linux/l2tp.h net/l2tp/l2tp_core.h+16 -110 replies
2/22net: l2tp: deprecate PPPOL2TP_MSG_* in favour of L2TP_MSG_*Documentation/networking/l2tp.txt include/uapi/linux/if_pppol2tp.h+10 -110 replies
3/22net: l2tp: ppp: change PPPOL2TP_MSG_* => L2TP_MSG_*net/l2tp/l2tp_ppp.c+27 -270 replies
4/22New kernel function to get IP overhead on a socket.include/linux/net.h net/socket.c+49 -00 replies
5/22L2TP:Adjust intf MTU, add underlay L3, L2 hdrs.net/l2tp/l2tp_eth.c+51 -40 replies
6/22l2tp: remove useless duplicate session detection in l2tp_netlinknet/l2tp/l2tp_netlink.c+0 -50 replies
7/22l2tp: remove l2tp_session_find()net/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+1 -530 replies
8/22l2tp: define parameters of l2tp_session_get*() as "const"net/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+7 -50 replies
9/22l2tp: define parameters of l2tp_tunnel_find*() as "const"net/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+4 -40 replies
10/22l2tp: initialise session's refcount before making it reachablenet/l2tp/l2tp_core.c+2 -40 replies
11/22l2tp: 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
12/22l2tp: hold tunnel while processing genl delete commandnet/l2tp/l2tp_netlink.c+4 -20 replies
13/22l2tp: hold tunnel while handling genl tunnel updatesnet/l2tp/l2tp_netlink.c+4 -20 replies
14/22l2tp: hold tunnel while handling genl TUNNEL_GET commandsnet/l2tp/l2tp_netlink.c+15 -120 replies
15/22l2tp: hold tunnel used while creating sessions with netlinknet/l2tp/l2tp_netlink.c+12 -90 replies
16/22l2tp: prevent creation of sessions on terminated tunnelsnet/l2tp/l2tp_core.c net/l2tp/l2tp_core.h+32 -130 replies
17/22l2tp: 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
18/22l2tp: fix l2tp_eth module loadingnet/l2tp/l2tp_eth.c+2 -490 replies
19/22l2tp: 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
20/22l2tp: initialise l2tp_eth sessions before registering themnet/l2tp/l2tp_eth.c+76 -320 replies
21/22l2tp: protect sock pointer of struct pppol2tp_session with RCUnet/l2tp/l2tp_ppp.c+101 -530 replies
22/22l2tp: 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 v2 yet.

Read the v2 thread

Cover letter [PATCH v2 00/22] l2tp locking and ordering fixes

Hi Greg.

*Now with better spelling of "upstream".*

This is for 4.9.

This is a follow-up to "fix l2tp use-after-free in pppol2tp_sendmsg" for 4.14. Pulling on the thread pulled in many other earlier locking fixes in between 4.9 and 4.14.

I've done some minor rework on a few of these to avoid pulling in refcount as a replacement for atomic which would have meant 10+ more patches (I still had compilation errors at 10).

Some minor other patch commutation was needed and where it wasn't completely trivial, I've added a note to the commit messages.

The series does include a few non-fixes, but they look safe and mean that the fixes (and other backports) apply more cleanly.

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 (17):
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/uapi/linux/if_pppol2tp.h  |  13 +-
 include/uapi/linux/l2tp.h         |  17 +-
 net/l2tp/l2tp_core.c              | 174 ++++++-----------
 net/l2tp/l2tp_core.h              |  46 +++--
 net/l2tp/l2tp_eth.c               | 214 +++++++++++++--------
 net/l2tp/l2tp_netlink.c           |  79 ++++----
 net/l2tp/l2tp_ppp.c               | 309 ++++++++++++++++++------------
 net/socket.c                      |  46 +++++
 10 files changed, 516 insertions(+), 393 deletions(-)
Signature · 1 line
2.27.0.rc0.183.gde8f92d652-goog