linux-kernel - [PATCH v3] tools/perf/util: Fix memory leak in trace-event-info.c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1381794504-4146-1-git-send-email-felipensp@gmail.com>
Date:	Mon, 14 Oct 2013 20:48:24 -0300
From:	Felipe Pena <felipensp@...il.com>
To:	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Paul Mackerras <paulus@...ba.org>,
	Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
	Namhyung Kim <namhyung@...nel.org>,
	Borislav Petkov <bp@...e.de>
Cc:	linux-kernel@...r.kernel.org, Felipe Pena <felipensp@...il.com>
Subject: [PATCH v3] tools/perf/util: Fix memory leak in trace-event-info.c

Fix for a memory leak on tracing_data_get() function when returning NULL explicitly

Signed-off-by: Felipe Pena <felipensp@...il.com>
---
 tools/perf/util/trace-event-info.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
index f3c9e55..83b3a67 100644
--- a/tools/perf/util/trace-event-info.c
+++ b/tools/perf/util/trace-event-info.c
@@ -496,7 +496,7 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,
 {
 	struct tracepoint_path *tps;
 	struct tracing_data *tdata;
-	int err;
+	int err = -1;

 	output_fd = fd;

@@ -506,7 +506,7 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,

 	tdata = malloc(sizeof(*tdata));
 	if (!tdata)
-		return NULL;
+		goto err_tps;

 	tdata->temp = temp;
 	tdata->size = 0;
@@ -518,13 +518,13 @@ struct tracing_data *tracing_data_get(struct list_head *pattrs,
 			 "/tmp/perf-XXXXXX");
 		if (!mkstemp(tdata->temp_file)) {
 			pr_debug("Can't make temp file");
-			return NULL;
+			goto err_tdata;
 		}

 		temp_fd = open(tdata->temp_file, O_RDWR);
 		if (temp_fd < 0) {
 			pr_debug("Can't read '%s'", tdata->temp_file);
-			return NULL;
+			goto err_tdata;
 		}

 		/*
@@ -562,11 +562,13 @@ out:
 		output_fd = fd;
 	}

+err_tdata:
 	if (err) {
 		free(tdata);
 		tdata = NULL;
 	}

+err_tps:
 	put_tracepoints_path(tps);
 	return tdata;
 }
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/