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: James Chapman <jchapman@katalix.com>
Reviewed-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 2c6378a9f3848c5ac7ea9fce08843e0c31cead08..cbc5de1373cd7c5316b9e945d7dd94b2ea47bb19 100644 (file)
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -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);