Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 13 Feb 2019 08:36:35 -0500
From:   Steven Rostedt <rostedt@goodmis.org>
To:     "zhangyi (F)" <yi.zhang@huawei.com>
Cc:     <mingo@redhat.com>, <linux-kernel@vger.kernel.org>,
        <miaoxie@huawei.com>
Subject: Re: [PATCH] tracing: fix incorrect tracer freeing when opening
 tracing pipe
Message-ID: <20190213083635.36f4762e@gandalf.local.home>
In-Reply-To: <1550060946-45984-1-git-send-email-yi.zhang@huawei.com>
References: <1550060946-45984-1-git-send-email-yi.zhang@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Wed, 13 Feb 2019 20:29:06 +0800
"zhangyi (F)" <yi.zhang@huawei.com> wrote:

> Commit d716ff71dd12 ("tracing: Remove taking of trace_types_lock in
> pipe files") use the current tracer instead of the copy in
> tracing_open_pipe(), but it forget to remove the freeing sentence in
> the error path.
> 
> Fixes: d716ff71dd12 ("tracing: Remove taking of trace_types_lock in pipe files")

Thanks.

As this is harmless (frees to NULL is ok, and iter is allocated with
kzalloc()), I'm going to just add this for the next merge window.

-- Steve

> Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
> ---
>  kernel/trace/trace.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index c521b73..b583ff7 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -5624,7 +5624,6 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)
>  	return ret;
>  
>  fail:
> -	kfree(iter->trace);
>  	kfree(iter);
>  	__trace_array_put(tr);
>  	mutex_unlock(&trace_types_lock);