From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757966AbbJ2Wjr (ORCPT <rfc822;w@1wt.eu>);
	Thu, 29 Oct 2015 18:39:47 -0400
Received: from mail.kernel.org ([198.145.29.136]:36030 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757644AbbJ2Wjq (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 29 Oct 2015 18:39:46 -0400
Date: Thu, 29 Oct 2015 19:39:41 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Wang Nan <wangnan0@huawei.com>, ast@plumgrid.com,
        brendan.d.gregg@gmail.com, a.p.zijlstra@chello.nl,
        daniel@iogearbox.net, dsahern@gmail.com, hekuang@huawei.com,
        jolsa@kernel.org, lizefan@huawei.com, namhyung@kernel.org,
        paulus@samba.org, linux-kernel@vger.kernel.org, pi3orama@163.com,
        xiakaixu@huawei.com
Subject: Re: [PATCH 12/31] perf probe: Reset args and nargs for
 probe_trace_event when failure
Message-ID: <20151029223941.GL2923@kernel.org>
References: <1444826502-49291-1-git-send-email-wangnan0@huawei.com>
 <1444826502-49291-13-git-send-email-wangnan0@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1444826502-49291-13-git-send-email-wangnan0@huawei.com>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Em Wed, Oct 14, 2015 at 12:41:23PM +0000, Wang Nan escreveu:
> When failure occures in add_probe_trace_event(), args in
> probe_trace_event is incomplete. Since information in it may be used
> in futher, this patch frees the allocated memory and set it to NULL
> to avoid dangling pointer.

Masami, can I have your Acked-by for this one?

Thanks,

- Arnaldo
 
> Signed-off-by: Wang Nan <wangnan0@huawei.com>
> Cc: Alexei Starovoitov <ast@plumgrid.com>
> Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
> Cc: Daniel Borkmann <daniel@iogearbox.net>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: He Kuang <hekuang@huawei.com>
> Cc: Jiri Olsa <jolsa@kernel.org>
> Cc: Kaixu Xia <xiakaixu@huawei.com>
> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Cc: Zefan Li <lizefan@huawei.com>
> Cc: pi3orama@163.com
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Link: http://lkml.kernel.org/n/ebpf-6yw9eg0ej3l4jnqhinngkw86@git.kernel.org
> ---
>  tools/perf/util/probe-finder.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
> index bd8f03d..b1581d7 100644
> --- a/tools/perf/util/probe-finder.c
> +++ b/tools/perf/util/probe-finder.c
> @@ -1235,6 +1235,10 @@ static int add_probe_trace_event(Dwarf_Die *sc_die, struct probe_finder *pf)
>  
>  end:
>  	free(args);
> +	if (ret) {
> +		tev->nargs = 0;
> +		zfree(&tev->args);
> +	}
>  	return ret;
>  }
>  
> -- 
> 1.8.3.4