Commit c37e0138 authored by James Chapman's avatar James Chapman Committed by David S. Miller
Browse files

l2tp: don't use sk_user_data in l2tp_udp_encap_err_recv 



If UDP sockets are aliased, sk might be the wrong socket. There's no
benefit to using sk_user_data to do some checks on the associated
tunnel context. Just report the error anyway, like udp core does.

Signed-off-by: default avatarJames Chapman <jchapman@katalix.com>
Reviewed-by: default avatarTom Parkin <tparkin@katalix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ff6a2ac2

net/l2tp/l2tp_core.c

+0 −6
Original line number Diff line number Diff line
@@ -1030,12 +1030,6 @@ EXPORT_SYMBOL_GPL(l2tp_udp_encap_recv); 
static void l2tp_udp_encap_err_recv(struct sock *sk, struct sk_buff *skb, int err,

				    __be16 port, u32 info, u8 *payload)

{

	struct l2tp_tunnel *tunnel;



	tunnel = rcu_dereference_sk_user_data(sk);

	if (!tunnel || tunnel->fd < 0)

		return;



	sk->sk_err = err;

	sk_error_report(sk);