Linux-Trace-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] trace-cmd: free kbuf on malloc err in tracecmd_read_page_record()
@ 2020-01-15 20:05 Marcelo Diop-Gonzalez
  2020-01-21  2:18 ` Steven Rostedt
  0 siblings, 1 reply; 2+ messages in thread
From: Marcelo Diop-Gonzalez @ 2020-01-15 20:05 UTC (permalink / raw)
  To: rostedt; +Cc: linux-trace-devel

This fixes an unlikely but possible leak

Signed-off-by: Marcelo Diop-Gonzalez <marcgonzalez@google.com>
---
 lib/trace-cmd/trace-input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index ac30a60..68da3a7 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -1746,7 +1746,7 @@ tracecmd_read_page_record(struct tep_handle *pevent, void *page, int size,
 
 	record = malloc(sizeof(*record));
 	if (!record)
-		return NULL;
+		goto out_free;
 	memset(record, 0, sizeof(*record));
 
 	record->ts = ts;
-- 
2.25.0.rc1.283.g88dfdc4193-goog


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] trace-cmd: free kbuf on malloc err in tracecmd_read_page_record()
  2020-01-15 20:05 [PATCH] trace-cmd: free kbuf on malloc err in tracecmd_read_page_record() Marcelo Diop-Gonzalez
@ 2020-01-21  2:18 ` Steven Rostedt
  0 siblings, 0 replies; 2+ messages in thread
From: Steven Rostedt @ 2020-01-21  2:18 UTC (permalink / raw)
  To: Marcelo Diop-Gonzalez; +Cc: linux-trace-devel

On Wed, 15 Jan 2020 15:05:15 -0500
Marcelo Diop-Gonzalez <marcgonzalez@google.com> wrote:

> This fixes an unlikely but possible leak

Applied, thanks Marcelo!

-- Steve

> 
> Signed-off-by: Marcelo Diop-Gonzalez <marcgonzalez@google.com>
> ---
>  lib/trace-cmd/trace-input.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
> index ac30a60..68da3a7 100644
> --- a/lib/trace-cmd/trace-input.c
> +++ b/lib/trace-cmd/trace-input.c
> @@ -1746,7 +1746,7 @@ tracecmd_read_page_record(struct tep_handle *pevent, void *page, int size,
>  
>  	record = malloc(sizeof(*record));
>  	if (!record)
> -		return NULL;
> +		goto out_free;
>  	memset(record, 0, sizeof(*record));
>  
>  	record->ts = ts;


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-15 20:05 [PATCH] trace-cmd: free kbuf on malloc err in tracecmd_read_page_record() Marcelo Diop-Gonzalez
2020-01-21  2:18 ` Steven Rostedt

Linux-Trace-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-trace-devel/0 linux-trace-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-trace-devel linux-trace-devel/ https://lore.kernel.org/linux-trace-devel \
		linux-trace-devel@vger.kernel.org
	public-inbox-index linux-trace-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-trace-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git