Commit ab6934e0 authored Jul 24, 2020 by Tom Parkin Committed by David S. Miller Jul 24, 2020

l2tp: WARN_ON rather than BUG_ON in l2tp_session_free

l2tp_session_free called BUG_ON if the tunnel magic feather value wasn't
correct. The intent of this was to catch lifetime bugs; for example
early tunnel free due to incorrect use of reference counts.

Since the tunnel magic feather being wrong indicates either early free
or structure corruption, we can avoid doing more damage by simply
leaving the tunnel structure alone. If the tunnel refcount isn't
dropped when it should be, the tunnel instance will remain in the
kernel, resulting in the tunnel structure and socket leaking.

Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 0dd62f69

net/l2tp/l2tp_core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1564,10 +1564,12 @@ void l2tp_session_free(struct l2tp_session *session)
		struct l2tp_tunnel *tunnel = session->tunnel;

		if (tunnel) {
		BUG_ON(tunnel->magic != L2TP_TUNNEL_MAGIC);
		if (WARN_ON(tunnel->magic != L2TP_TUNNEL_MAGIC))
		goto out;
		l2tp_tunnel_dec_refcount(tunnel);
		}

		out:
		kfree(session);
		}
		EXPORT_SYMBOL_GPL(l2tp_session_free);

Admin message