Commit b5711b8e authored Jul 28, 2009 by Casey Dahlin Committed by David Teigland Aug 18, 2009

dlm: fix double-release of socket in error exit path



The last correction to the tcp_connect_to_sock error exit path,
commit a89d63a1, can free an already
freed socket, due to collision with a previous (incomplete) attempt
to fix the same issue, commit 311f6fc7.

Signed-off-by: Casey Dahlin <cdahlin@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

parent df4ecf15

fs/dlm/lowcomms.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -926,10 +926,8 @@ static void tcp_connect_to_sock(struct connection *con)
		goto out_err;

		memset(&saddr, 0, sizeof(saddr));
		if (dlm_nodeid_to_addr(con->nodeid, &saddr)) {
		sock_release(sock);
		if (dlm_nodeid_to_addr(con->nodeid, &saddr))
		goto out_err;
		}

		sock->sk->sk_user_data = con;
		con->rx_action = receive_from_sock;