diff options
author | Eric Dumazet <edumazet@google.com> | 2016-01-21 11:02:54 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-01-21 14:20:14 -0500 |
commit | e62a123b8ef7c5dc4db2c16383d506860ad21b47 (patch) | |
tree | 9735bd7a01e5513a62cced14a6b5703379ca4379 /net | |
parent | 35e2d1152b22eae99c961affbe85374bef05a775 (diff) |
tcp: fix NULL deref in tcp_v4_send_ack()
Neal reported crashes with this stack trace :
RIP: 0010:[<ffffffff8c57231b>] tcp_v4_send_ack+0x41/0x20f
...
CR2: 0000000000000018 CR3: 000000044005c000 CR4: 00000000001427e0
...
[<ffffffff8c57258e>] tcp_v4_reqsk_send_ack+0xa5/0xb4
[<ffffffff8c1a7caa>] tcp_check_req+0x2ea/0x3e0
[<ffffffff8c19e420>] tcp_rcv_state_process+0x850/0x2500
[<ffffffff8c1a6d21>] tcp_v4_do_rcv+0x141/0x330
[<ffffffff8c56cdb2>] sk_backlog_rcv+0x21/0x30
[<ffffffff8c098bbd>] tcp_recvmsg+0x75d/0xf90
[<ffffffff8c0a8700>] inet_recvmsg+0x80/0xa0
[<ffffffff8c17623e>] sock_aio_read+0xee/0x110
[<ffffffff8c066fcf>] do_sync_read+0x6f/0xa0
[<ffffffff8c0673a1>] SyS_read+0x1e1/0x290
[<ffffffff8c5ca262>] system_call_fastpath+0x16/0x1b
The problem here is the skb we provide to tcp_v4_send_ack() had to
be parked in the backlog of a new TCP fastopen child because this child
was owned by the user at the time an out of window packet arrived.
Before queuing a packet, TCP has to set skb->dev to NULL as the device
could disappear before packet is removed from the queue.
Fix this issue by using the net pointer provided by the socket (being a
timewait or a request socket).
IPv6 is immune to the bug : tcp_v6_send_response() already gets the net
pointer from the socket if provided.
Fixes: 168a8f58059a ("tcp: TCP Fast Open Server - main code path")
Reported-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jerry Chu <hkchu@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index c7d1fb50f381..2a67244f97ca 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -708,7 +708,8 @@ release_sk1: | |||
708 | outside socket context is ugly, certainly. What can I do? | 708 | outside socket context is ugly, certainly. What can I do? |
709 | */ | 709 | */ |
710 | 710 | ||
711 | static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack, | 711 | static void tcp_v4_send_ack(struct net *net, |
712 | struct sk_buff *skb, u32 seq, u32 ack, | ||
712 | u32 win, u32 tsval, u32 tsecr, int oif, | 713 | u32 win, u32 tsval, u32 tsecr, int oif, |
713 | struct tcp_md5sig_key *key, | 714 | struct tcp_md5sig_key *key, |
714 | int reply_flags, u8 tos) | 715 | int reply_flags, u8 tos) |
@@ -723,7 +724,6 @@ static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack, | |||
723 | ]; | 724 | ]; |
724 | } rep; | 725 | } rep; |
725 | struct ip_reply_arg arg; | 726 | struct ip_reply_arg arg; |
726 | struct net *net = dev_net(skb_dst(skb)->dev); | ||
727 | 727 | ||
728 | memset(&rep.th, 0, sizeof(struct tcphdr)); | 728 | memset(&rep.th, 0, sizeof(struct tcphdr)); |
729 | memset(&arg, 0, sizeof(arg)); | 729 | memset(&arg, 0, sizeof(arg)); |
@@ -785,7 +785,8 @@ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb) | |||
785 | struct inet_timewait_sock *tw = inet_twsk(sk); | 785 | struct inet_timewait_sock *tw = inet_twsk(sk); |
786 | struct tcp_timewait_sock *tcptw = tcp_twsk(sk); | 786 | struct tcp_timewait_sock *tcptw = tcp_twsk(sk); |
787 | 787 | ||
788 | tcp_v4_send_ack(skb, tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt, | 788 | tcp_v4_send_ack(sock_net(sk), skb, |
789 | tcptw->tw_snd_nxt, tcptw->tw_rcv_nxt, | ||
789 | tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale, | 790 | tcptw->tw_rcv_wnd >> tw->tw_rcv_wscale, |
790 | tcp_time_stamp + tcptw->tw_ts_offset, | 791 | tcp_time_stamp + tcptw->tw_ts_offset, |
791 | tcptw->tw_ts_recent, | 792 | tcptw->tw_ts_recent, |
@@ -804,8 +805,10 @@ static void tcp_v4_reqsk_send_ack(const struct sock *sk, struct sk_buff *skb, | |||
804 | /* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV | 805 | /* sk->sk_state == TCP_LISTEN -> for regular TCP_SYN_RECV |
805 | * sk->sk_state == TCP_SYN_RECV -> for Fast Open. | 806 | * sk->sk_state == TCP_SYN_RECV -> for Fast Open. |
806 | */ | 807 | */ |
807 | tcp_v4_send_ack(skb, (sk->sk_state == TCP_LISTEN) ? | 808 | u32 seq = (sk->sk_state == TCP_LISTEN) ? tcp_rsk(req)->snt_isn + 1 : |
808 | tcp_rsk(req)->snt_isn + 1 : tcp_sk(sk)->snd_nxt, | 809 | tcp_sk(sk)->snd_nxt; |
810 | |||
811 | tcp_v4_send_ack(sock_net(sk), skb, seq, | ||
809 | tcp_rsk(req)->rcv_nxt, req->rsk_rcv_wnd, | 812 | tcp_rsk(req)->rcv_nxt, req->rsk_rcv_wnd, |
810 | tcp_time_stamp, | 813 | tcp_time_stamp, |
811 | req->ts_recent, | 814 | req->ts_recent, |