From: Tycho Andersen <tycho@tycho.ws>
Date: Fri, 2 Nov 2018 20:18:20 +0000 (-0600)
Subject: dlm: fix invalid free
X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~5659^2~12
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=d968b4e240cfe39d39d80483bac8bca8716fd93c;p=linux.git

dlm: fix invalid free

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>
---

diff --git a/fs/dlm/member.c b/fs/dlm/member.c
index 3fda3832cf6a..cad6d85911a8 100644
--- a/fs/dlm/member.c
+++ b/fs/dlm/member.c
@@ -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;
 }