[Ocfs2-tools-devel] [PATCH 1/1] o2cb: use ocfs2_free to free o2cb_cluster_desc

Srinivas Eeda srinivas.eeda at oracle.com
Fri Jul 12 23:25:53 PDT 2013


This will initialize it to NULL which prevents double free.

Signed-off-by: Srinivas Eeda <srinivas.eeda at oracle.com>
---
 libo2cb/o2cb_abi.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c
index ae03595..cc50689 100644
--- a/libo2cb/o2cb_abi.c
+++ b/libo2cb/o2cb_abi.c
@@ -1762,9 +1762,9 @@ errcode_t o2cb_group_leave(struct o2cb_cluster_desc *cluster,
 void o2cb_free_cluster_desc(struct o2cb_cluster_desc *cluster)
 {
 	if (cluster->c_stack)
-		free(cluster->c_stack);
+		ocfs2_free(&cluster->c_stack);
 	if (cluster->c_cluster)
-		free(cluster->c_cluster);
+		ocfs2_free(&cluster->c_cluster);
 }
 
 errcode_t o2cb_running_cluster_desc(struct o2cb_cluster_desc *cluster)
@@ -1815,10 +1815,8 @@ errcode_t o2cb_running_cluster_desc(struct o2cb_cluster_desc *cluster)
 out:
 	if (clusters)
 		o2cb_free_cluster_list(clusters);
-	if (err) {
-		free(cluster->c_stack);
-		free(cluster->c_cluster);
-	}
+	if (err)
+		o2cb_free_cluster_desc(cluster);
 
 	return err;
 }
-- 
1.5.6.5




More information about the Ocfs2-tools-devel mailing list