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;
Message-ID: <bae57723-50f4-a497-3691-33c4f1234896@huawei.com>
Date:   Thu, 13 Jul 2023 22:23:20 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.0
Subject: Re: [PATCH] traing: Fix memory leak of iter->temp when reading
 trace_pipe
Content-Language: en-US
To:     <rostedt@goodmis.org>, <mhiramat@kernel.org>
CC:     <linux-kernel@vger.kernel.org>,
        <linux-trace-kernel@vger.kernel.org>
References: <20230713141435.1133021-1-zhengyejian1@huawei.com>
From:   Zheng Yejian <zhengyejian1@huawei.com>
In-Reply-To: <20230713141435.1133021-1-zhengyejian1@huawei.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2023/7/13 22:14, Zheng Yejian wrote:
> kmemleak reports:
>    unreferenced object 0xffff88814d14e200 (size 256):
>      comm "cat", pid 336, jiffies 4294871818 (age 779.490s)
>      hex dump (first 32 bytes):
>        04 00 01 03 00 00 00 00 08 00 00 00 00 00 00 00  ................
>        0c d8 c8 9b ff ff ff ff 04 5a ca 9b ff ff ff ff  .........Z......
>      backtrace:
>        [<ffffffff9bdff18f>] __kmalloc+0x4f/0x140
>        [<ffffffff9bc9238b>] trace_find_next_entry+0xbb/0x1d0
>        [<ffffffff9bc9caef>] trace_print_lat_context+0xaf/0x4e0
>        [<ffffffff9bc94490>] print_trace_line+0x3e0/0x950
>        [<ffffffff9bc95499>] tracing_read_pipe+0x2d9/0x5a0
>        [<ffffffff9bf03a43>] vfs_read+0x143/0x520
>        [<ffffffff9bf04c2d>] ksys_read+0xbd/0x160
>        [<ffffffff9d0f0edf>] do_syscall_64+0x3f/0x90
>        [<ffffffff9d2000aa>] entry_SYSCALL_64_after_hwframe+0x6e/0xd8
> 
> when reading file 'trace_pipe', 'iter->temp' is allocated or relocated
> in trace_find_next_entry() but not freed before 'trace_pipe' is closed.
> 
> To fix it, free 'iter->temp' in tracing_release_pipe().
> 

Sorry, forget the Fixes tag:(

Is following Fixes right?
Fixes: ff895103a84a ("tracing: Save off entry when peeking at next entry")

> Signed-off-by: Zheng Yejian <zhengyejian1@huawei.com>
> ---
>   kernel/trace/trace.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 4529e264cb86..94cfaa884578 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -6764,6 +6764,7 @@ static int tracing_release_pipe(struct inode *inode, struct file *file)
>   
>   	free_cpumask_var(iter->started);
>   	kfree(iter->fmt);
> +	kfree(iter->temp);
>   	mutex_destroy(&iter->mutex);
>   	kfree(iter);
>