tree 12d71dfe6a8eb01abc6b27ac4ba262a33387f291
parent eab9a2d5f323228405b5bacf2ff3fc4ad9cf81e5
parent ecd012e45ab5fd76ed57546865897ce35920f56b
author David S. Miller <davem@davemloft.net> 1529079157 -0700
committer David S. Miller <davem@davemloft.net> 1529079157 -0700

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 <davem@davemloft.net>