diff options
| author | Casey Dahlin <cdahlin@redhat.com> | 2009-07-28 12:29:05 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2009-08-18 15:09:24 -0500 |
| commit | b5711b8e5a437ca7d35321d19de568b4f76a7739 (patch) | |
| tree | 945c9f712833ed2810e3179ab626fb974e438996 /fs/dlm/lowcomms.c | |
| parent | df4ecf1524c7793de3121b2d4e5fc6bcc0da3bfb (diff) | |
| download | op-kernel-dev-b5711b8e5a437ca7d35321d19de568b4f76a7739.zip op-kernel-dev-b5711b8e5a437ca7d35321d19de568b4f76a7739.tar.gz | |
dlm: fix double-release of socket in error exit path
The last correction to the tcp_connect_to_sock error exit path,
commit a89d63a159b1ba5833be2bef00adf8ad8caac8be, can free an already
freed socket, due to collision with a previous (incomplete) attempt
to fix the same issue, commit 311f6fc77c51926dbdfbeab0a5d88d70f01fa3f4.
Signed-off-by: Casey Dahlin <cdahlin@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/lowcomms.c')
| -rw-r--r-- | fs/dlm/lowcomms.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 618a60f..210d52c 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -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; |
