OSDN Git Service

dlm: fix invalid free
authorTycho Andersen <tycho@tycho.ws>
Fri, 2 Nov 2018 20:18:20 +0000 (14:18 -0600)
committerDavid Teigland <teigland@redhat.com>
Wed, 7 Nov 2018 21:50:34 +0000 (15:50 -0600)
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>
fs/dlm/member.c

index 3fda383..cad6d85 100644 (file)
@@ -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;
 }