mirror of
https://github.com/torvalds/linux.git
synced 2026-06-05 13:06:59 +02:00
fs: dlm: fix sock release if listen fails
commit08ae0547e7upstream. This patch fixes a double sock_release() call when the listen() is called for the dlm lowcomms listen socket. The caller of dlm_listen_for_all should never care about releasing the socket if dlm_listen_for_all() fails, it's done now only once if listen() fails. Cc: stable@vger.kernel.org Fixes:2dc6b1158c("fs: dlm: introduce generic listen") Signed-off-by: Alexander Aring <aahringo@redhat.com> Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
bb641476f5
commit
9e72fec62f
|
|
@ -1820,7 +1820,7 @@ static int dlm_listen_for_all(void)
|
|||
result = sock->ops->listen(sock, 5);
|
||||
if (result < 0) {
|
||||
dlm_close_sock(&listen_con.sock);
|
||||
goto out;
|
||||
return result;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
|
@ -2023,7 +2023,6 @@ int dlm_lowcomms_start(void)
|
|||
dlm_proto_ops = NULL;
|
||||
fail_proto_ops:
|
||||
dlm_allow_conn = 0;
|
||||
dlm_close_sock(&listen_con.sock);
|
||||
work_stop();
|
||||
fail_local:
|
||||
deinit_local();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user