Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: po/k/mVz/rKQaNpunDFGyqwHb7oftmN3x2KIS4nbF4kaHt0gr1UPXQFvpe6SXoijBbRbG+rTUl
 bDB2wMf4hAtQ==
IronPort-SDR: GwGJVhQl5LsZCtYfS7A9iPjpGOoLjIqPKg8jU0lNh+QzaUUg/j/tOkU/84RoXAzvNqvUBXGq2n
 hbejdvwrRCjQ==
Subject: Re: [PATCH] tracing: fix double free
To:     trix@redhat.com, rostedt@goodmis.org, mingo@redhat.com,
        natechancellor@gmail.com, ndesaulniers@google.com,
        baohong.liu@intel.com
Cc:     linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com
References: <20200907135845.15804-1-trix@redhat.com>
From:   "Zanussi, Tom" <tom.zanussi@linux.intel.com>
Message-ID: <84df7ef3-0a36-0929-3fa9-74ab773ca12e@linux.intel.com>
Date:   Tue, 8 Sep 2020 09:41:01 -0500
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.0
MIME-Version: 1.0
In-Reply-To: <20200907135845.15804-1-trix@redhat.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-GB
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Hi Tom,

On 9/7/2020 8:58 AM, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> clang static analyzer reports this problem
> 
> trace_events_hist.c:3824:3: warning: Attempt to free
>    released memory
>      kfree(hist_data->attrs->var_defs.name[i]);
> 
> In parse_var_defs() if there is a problem allocating
> var_defs.expr, the earlier var_defs.name is freed.
> This free is duplicated by free_var_defs() which frees
> the rest of the list.
> 
> Because free_var_defs() has to run anyway, remove the
> second free fom parse_var_defs().
> 
> Fixes: 30350d65ac56 ("tracing: Add variable support to hist triggers")
> Signed-off-by: Tom Rix <trix@redhat.com>

Good catch, thanks for fixing this!

Reviewed-by: Tom Zanussi <tom.zanussi@linux.intel.com>

> ---
>   kernel/trace/trace_events_hist.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
> index 0b933546142e..1b2ef6490229 100644
> --- a/kernel/trace/trace_events_hist.c
> +++ b/kernel/trace/trace_events_hist.c
> @@ -3865,7 +3865,6 @@ static int parse_var_defs(struct hist_trigger_data *hist_data)
>   
>   			s = kstrdup(field_str, GFP_KERNEL);
>   			if (!s) {
> -				kfree(hist_data->attrs->var_defs.name[n_vars]);
>   				ret = -ENOMEM;
>   				goto free;
>   			}
>