Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 17 Jun 2022 17:47:20 -0400
From:   Steven Rostedt <rostedt@goodmis.org>
To:     Wang ShaoBo <bobo.shaobowang@huawei.com>
Cc:     <cj.chengjian@huawei.com>, <linux-kernel@vger.kernel.org>,
        <liwei391@huawei.com>, <mhiramat@kernel.org>, <acme@redhat.com>,
        <yuehaibing@huawei.com>
Subject: Re: [PATCH 1/2] libtraceevent: fix memleak in make_bprint_args()
Message-ID: <20220617174720.6f63b5c8@gandalf.local.home>
In-Reply-To: <20220513023308.2400381-2-bobo.shaobowang@huawei.com>
References: <20220513023308.2400381-1-bobo.shaobowang@huawei.com>
        <20220513023308.2400381-2-bobo.shaobowang@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Fri, 13 May 2022 10:33:07 +0800
Wang ShaoBo <bobo.shaobowang@huawei.com> wrote:

> Release arg allocated from alloc_arg() when strdup failed in make_bprint_args().
> 
> Fixes: a6d2a61ac653 ("tools lib traceevent: Remove some die() calls")
> Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
> ---
>  tools/lib/traceevent/event-parse.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
> index 8e24c4c78c7f..69e4d5229362 100644
> --- a/tools/lib/traceevent/event-parse.c
> +++ b/tools/lib/traceevent/event-parse.c
> @@ -4507,8 +4507,10 @@ static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, s
>  				arg->next = NULL;
>  				arg->type = TEP_PRINT_BSTRING;
>  				arg->string.string = strdup(bptr);
> -				if (!arg->string.string)
> +				if (!arg->string.string) {
> +					free(arg);
>  					goto out_free;

This is a fix, thank you. But libtraceevent now lives here:

  https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git/

I'll port this patch to that.

Thanks,

-- Steve

> +				}
>  				bptr += strlen(bptr) + 1;
>  				*next = arg;
>  				next = &arg->next;