fabrics: do not leak nvme_ctrl_t object on connect

igaw · igaw · commit 353e0fb908be · 2024-08-01T15:33:16.000+02:00
valgrinds reports that the nvme_ctrl_t is leaked in the connect command.
Let's introduced a new cleanup helper for this.

Signed-off-by: Daniel Wagner &lt;dwagner@suse.de&gt;
diff --git a/fabrics.c b/fabrics.c
@@ -899,7 +899,7 @@ int nvmf_connect(const char *desc, int argc, char **argv)
 	unsigned int verbose = 0;
 	_cleanup_nvme_root_ nvme_root_t r = NULL;
 	nvme_host_t h;
-	nvme_ctrl_t c;
+	_cleanup_nvme_ctrl_ nvme_ctrl_t c = NULL;
 	int ret;
 	nvme_print_flags_t flags;
 	struct nvme_fabrics_config cfg = { 0 };
diff --git a/util/cleanup.h b/util/cleanup.h
@@ -42,6 +42,9 @@ static inline void cleanup_nvme_root(nvme_root_t *r)
 }
 #define _cleanup_nvme_root_ __cleanup__(cleanup_nvme_root)
 
+static inline DEFINE_CLEANUP_FUNC(cleanup_nvme_ctrl, nvme_ctrl_t, nvme_free_ctrl)
+#define _cleanup_nvme_ctrl_ __cleanup__(cleanup_nvme_ctrl)
+
 static inline void free_uri(struct nvme_fabrics_uri **uri)
 {
 	if (*uri)

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,9 @@ static inline void cleanup_nvme_root(nvme_root_t *r)`
`42`	`42`	`}`
`43`	`43`	`#define _cleanup_nvme_root_ __cleanup__(cleanup_nvme_root)`
`44`	`44`
	`45`	`+static inline DEFINE_CLEANUP_FUNC(cleanup_nvme_ctrl, nvme_ctrl_t, nvme_free_ctrl)`
	`46`	`+#define _cleanup_nvme_ctrl_ __cleanup__(cleanup_nvme_ctrl)`
	`47`	`+`
`45`	`48`	`static inline void free_uri(struct nvme_fabrics_uri **uri)`
`46`	`49`	`{`
`47`	`50`	`if (*uri)`