diff options
| author | Guillaume Nault <g.nault@alphalink.fr> | 2018-06-15 15:39:19 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-15 09:12:37 -0700 |
| commit | ecd012e45ab5fd76ed57546865897ce35920f56b (patch) | |
| tree | 12d71dfe6a8eb01abc6b27ac4ba262a33387f291 /net | |
| parent | de9bada5d389903f4faf33980e6a95a2911c7e6d (diff) | |
| download | linux-stable-ecd012e45ab5fd76ed57546865897ce35920f56b.tar.gz linux-stable-ecd012e45ab5fd76ed57546865897ce35920f56b.tar.bz2 linux-stable-ecd012e45ab5fd76ed57546865897ce35920f56b.zip | |
l2tp: filter out non-PPP sessions in pppol2tp_tunnel_ioctl()
pppol2tp_tunnel_ioctl() can act on an L2TPv3 tunnel, in which case
'session' may be an Ethernet pseudo-wire.
However, pppol2tp_session_ioctl() expects a PPP pseudo-wire, as it
assumes l2tp_session_priv() points to a pppol2tp_session structure. For
an Ethernet pseudo-wire l2tp_session_priv() points to an l2tp_eth_sess
structure instead, making pppol2tp_session_ioctl() access invalid
memory.
Fixes: d9e31d17ceba ("l2tp: Add L2TP ethernet pseudowire support")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/l2tp/l2tp_ppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c index f429fed06a1e..55188382845c 100644 --- a/net/l2tp/l2tp_ppp.c +++ b/net/l2tp/l2tp_ppp.c @@ -1201,7 +1201,7 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel, l2tp_session_get(sock_net(sk), tunnel, stats.session_id); - if (session) { + if (session && session->pwtype == L2TP_PWTYPE_PPP) { err = pppol2tp_session_ioctl(session, cmd, arg); l2tp_session_dec_refcount(session); |