Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc2cf4e authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by David S. Miller
Browse files

net: diag: Don't double-free TCP_NEW_SYN_RECV sockets in tcp_abort 



When tcp_diag_destroy closes a TCP_NEW_SYN_RECV socket, it first
frees it by calling inet_csk_reqsk_queue_drop_and_and_put in
tcp_abort, and then frees it again by calling sock_gen_put.

Since tcp_abort only has one caller, and all the other codepaths
in tcp_abort don't free the socket, just remove the free in that
function.

Cc: David Ahern <dsa@cumulusnetworks.com>
Tested: passes Android sock_diag_test.py, which exercises this codepath
Fixes: d7226c7a ("net: diag: Fix refcnt leak in error path destroying socket")
Signed-off-by: default avatarLorenzo Colitti <lorenzo@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Tested-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e7372197

net/ipv4/tcp.c

+1 −2
Original line number Diff line number Diff line
@@ -3720,8 +3720,7 @@ int tcp_abort(struct sock *sk, int err) 
			struct request_sock *req = inet_reqsk(sk);



			local_bh_disable();

			inet_csk_reqsk_queue_drop_and_put(req->rsk_listener,

							  req);

			inet_csk_reqsk_queue_drop(req->rsk_listener, req);

			local_bh_enable();

			return 0;

		}