Skip to content

Commit ecd012e

Browse files
Guillaume Naultdavem330
authored andcommitted
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: d9e31d1 ("l2tp: Add L2TP ethernet pseudowire support") Signed-off-by: Guillaume Nault <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent de9bada commit ecd012e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

net/l2tp/l2tp_ppp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ static int pppol2tp_tunnel_ioctl(struct l2tp_tunnel *tunnel,
12011201
l2tp_session_get(sock_net(sk), tunnel,
12021202
stats.session_id);
12031203

1204-
if (session) {
1204+
if (session && session->pwtype == L2TP_PWTYPE_PPP) {
12051205
err = pppol2tp_session_ioctl(session, cmd,
12061206
arg);
12071207
l2tp_session_dec_refcount(session);

0 commit comments

Comments
 (0)