fs: dlm: fix sock release if listen fails

commit 08ae0547e75ec3d062b6b6b9cf4830c730df68df upstream.

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: 2dc6b1158c28 ("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>

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 59f64c5..2cb9f3b 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -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 @@ fail_listen:
        dlm_proto_ops = NULL;
 fail_proto_ops:
        dlm_allow_conn = 0;
-       dlm_close_sock(&listen_con.sock);
        work_stop();
 fail_local:
        deinit_local();