Commit afb4717a authored Nov 02, 2018 by Tycho Andersen Committed by Greg Kroah-Hartman Dec 01, 2019

dlm: fix invalid free



[ Upstream commit d968b4e240cfe39d39d80483bac8bca8716fd93c ]

dlm_config_nodes() does not allocate nodes on failure, so we should not
free() nodes when it fails.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 30fc13ae

fs/dlm/member.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -680,7 +680,7 @@ int dlm_ls_start(struct dlm_ls *ls)

		error = dlm_config_nodes(ls->ls_name, &nodes, &count);
		if (error < 0)
		goto fail;
		goto fail_rv;

		spin_lock(&ls->ls_recover_lock);

		@@ -712,8 +712,9 @@ int dlm_ls_start(struct dlm_ls *ls)
		return 0;

		fail:
		kfree(rv);
		kfree(nodes);
		fail_rv:
		kfree(rv);
		return error;
		}