l2tp: check ps->sock before running pppol2tp_session_ioctl()

i/linux

[ Upstream commit 5903f594935a3841137c86b9d5b75143a5b7121c ]

When pppol2tp_session_ioctl() is called by pppol2tp_tunnel_ioctl(),
the session may be unconnected. That is, it was created by
pppol2tp_session_create() and hasn't been connected with
pppol2tp_connect(). In this case, ps->sock is NULL, so we need to check
for this case in order to avoid dereferencing a NULL pointer.

Fixes: 309795f4be ("l2tp: Add netlink control API for L2TP")
Signed-off-by: Guillaume Nault <g.nault@alphalink.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

This commit is contained in:

Guillaume Nault

2017-10-13 19:22:35 +02:00

committed by

Greg Kroah-Hartman

parent e12c42c552

commit 9075216b8b

1 changed files with 3 additions and 0 deletions

									
										net/l2tp/l2tp_ppp.c
									
		+3
		
												View File
												
				@@ -993,6 +993,9 @@ static int pppol2tp_session_ioctl(struct l2tp_session *session,

						 session->name, cmd, arg);

					sk = ps->sock;

					if (!sk)

						return -EBADR;

					sock_hold(sk);

					switch (cmd) {