linux-kernel - Re: [PATCH] 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-prev] [day] [month] [year] [list]

Date:	Thu, 10 Oct 2013 17:16:41 +0900
From:	Namhyung Kim <namhyung@...nel.org>
To:	Felipe Pena <felipensp@...il.com>
Cc:	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Paul Mackerras <paulus@...ba.org>,
	Ingo Molnar <mingo@...hat.com>,
	Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
	Borislav Petkov <bp@...e.de>, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] tools/perf/util: Fix memory leak in trace-event-info.c

Hi Felipe,

On Wed,  9 Oct 2013 23:28:55 -0300, Felipe Pena wrote:
> Fix for a memory leak on tracing_data_get() function when returning NULL explicitly

Thanks for fixing this bug.  Please see comment below.

>
> Signed-off-by: Felipe Pena <felipensp@...il.com>
> ---
>  tools/perf/util/trace-event-info.c |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/util/trace-event-info.c b/tools/perf/util/trace-event-info.c
> index f3c9e55..06f8624 100644
> --- a/tools/perf/util/trace-event-info.c
> +++ b/tools/perf/util/trace-event-info.c
> @@ -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;
>  		}
>
>  		/*
> @@ -569,6 +569,10 @@ out:
>
>  	put_tracepoints_path(tps);
>  	return tdata;
> +
> +err_tdata:
> +	free(tdata);
> +	return NULL;
>  }

It should call put_tracepoints_path() too in case of error.  So I
suggest that setting err to an appropriate code and goto if (err) block
above put_tracepoints_path().

Thanks,
Namhyung
--
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/