From: David S. Miller Date: Fri, 15 Jun 2018 16:12:37 +0000 (-0700) Subject: Merge branch 'l2tp-l2tp_ppp-must-ignore-non-PPP-sessions' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=695ad876d091530e3eb5def7827f8d0106ca3e9f;p=linux.git Merge branch 'l2tp-l2tp_ppp-must-ignore-non-PPP-sessions' Guillaume Nault says: ==================== l2tp: l2tp_ppp must ignore non-PPP sessions The original L2TP code was written for version 2 of the protocol, which could only carry PPP sessions. Then L2TPv3 generalised the protocol so that it could transport different kinds of pseudo-wires. But parts of the l2tp_ppp module still break in presence of non-PPP sessions. Assuming L2TPv2 tunnels can only transport PPP sessions is right, but l2tp_netlink failed to ensure that (fixed in patch 1). When retrieving a session from an arbitrary tunnel, l2tp_ppp needs to filter out non-PPP sessions (last occurrence fixed in patch 2). ==================== Signed-off-by: David S. Miller --- 695ad876d091530e3eb5def7827f8d0106ca3e9f