Commit 8f45f089 authored by Dan Carpenter's avatar Dan Carpenter Committed by Andrew Morton
Browse files

ocfs2: fix double free in user_cluster_connect() 

user_cluster_disconnect() frees "conn->cc_private" which is "lc" but then
the error handling frees "lc" a second time.  Set "lc" to NULL on this
path to avoid a double free.

Link: https://lkml.kernel.org/r/aNKDz_7JF7aycZ0k@stanley.mountain


Fixes: c994c2eb ("ocfs2: use the new DLM operation callbacks while requesting new lockspace")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.de>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 99b70ece

fs/ocfs2/stack_user.c

+1 −0
Original line number Diff line number Diff line
@@ -1011,6 +1011,7 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn) 
			printk(KERN_ERR "ocfs2: Could not determine"

					" locking version\n");

			user_cluster_disconnect(conn);

			lc = NULL;

			goto out;

		}

		wait_event(lc->oc_wait, (atomic_read(&lc->oc_this_node) > 0));