[9610] tcp: clear tp->packets_out when purging write queue
authorSoheil Hassas Yeganeh <soheil@google.com>
Sun, 15 Apr 2018 00:45:20 +0000 (20:45 -0400)
committerJungi Lee <jungilsi.lee@samsung.com>
Tue, 17 Jul 2018 12:00:13 +0000 (21:00 +0900)
commitf3e6f7450861d1cc839a7d9edd0bebd2e531c9fa
tree0e8c84a5d73f47bd973631a69eda4bf1276fba3f
parent83f6f508be8bbd8df6c30275a4ee79d73401c590
[9610] tcp: clear tp->packets_out when purging write queue

Clear tp->packets_out when purging the write queue, otherwise
tcp_rearm_rto() mistakenly assumes TCP write queue is not empty.
This results in NULL pointer dereference.

Also, remove the redundant `tp->packets_out = 0` from
tcp_disconnect(), since tcp_disconnect() calls
tcp_write_queue_purge().

Change-Id: If7e959a4adf6a830ff551bcf2452f15dcb7ccdab
Fixes: a27fd7a8ed38 (tcp: purge write queue upon RST)
Reported-by: Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
Reported-by: Sami Farin <hvtaifwkbgefbaei@gmail.com>
Tested-by: Sami Farin <hvtaifwkbgefbaei@gmail.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/net/tcp.h
net/ipv4/tcp.c