Commit 5c487bb9 authored by Song Liu's avatar Song Liu Committed by David S. Miller

tcp: tracepoint: only call trace_tcp_send_reset with full socket

tracepoint tcp_send_reset requires a full socket to work. However, it
may be called when in TCP_TIME_WAIT:

        case TCP_TW_RST:
                tcp_v6_send_reset(sk, skb);
                inet_twsk_deschedule_put(inet_twsk(sk));
                goto discard_it;

To avoid this problem, this patch checks the socket with sk_fullsock()
before calling trace_tcp_send_reset().

Fixes: c24b14c4 ("tcp: add tracepoint trace_tcp_send_reset")
Signed-off-by: default avatarSong Liu <songliubraving@fb.com>
Reviewed-by: default avatarLawrence Brakmo <brakmo@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 043e337f
...@@ -705,7 +705,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb) ...@@ -705,7 +705,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
*/ */
if (sk) { if (sk) {
arg.bound_dev_if = sk->sk_bound_dev_if; arg.bound_dev_if = sk->sk_bound_dev_if;
trace_tcp_send_reset(sk, skb); if (sk_fullsock(sk))
trace_tcp_send_reset(sk, skb);
} }
BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) != BUILD_BUG_ON(offsetof(struct sock, sk_bound_dev_if) !=
......
...@@ -942,7 +942,8 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb) ...@@ -942,7 +942,8 @@ static void tcp_v6_send_reset(const struct sock *sk, struct sk_buff *skb)
if (sk) { if (sk) {
oif = sk->sk_bound_dev_if; oif = sk->sk_bound_dev_if;
trace_tcp_send_reset(sk, skb); if (sk_fullsock(sk))
trace_tcp_send_reset(sk, skb);
} }
tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, key, 1, 0, 0); tcp_v6_send_response(sk, skb, seq, ack_seq, 0, 0, 0, oif, key, 1, 0, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment