Message-ID: <3ad1c3b3-f54d-4b0e-2441-ab348d099f3f@acm.org>
Date:   Sat, 4 Feb 2023 15:17:04 -0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH] trace/blktrace: fix memory leak with using
 debugfs_lookup()
Content-Language: en-US
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-trace-kernel@vger.kernel.org
Cc:     Jens Axboe <axboe@kernel.dk>, Steven Rostedt <rostedt@goodmis.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
References: <20230202141956.2299521-1-gregkh@linuxfoundation.org>
From:   Bart Van Assche <bvanassche@acm.org>
In-Reply-To: <20230202141956.2299521-1-gregkh@linuxfoundation.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2/2/23 06:19, Greg Kroah-Hartman wrote:
> When calling debugfs_lookup() the result must have dput() called on it,
> otherwise the memory will leak over time.  To make things simpler, just
> call debugfs_lookup_and_remove() instead which handles all of the logic
> at once.
> 
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: Steven Rostedt <rostedt@goodmis.org>
> Cc: Masami Hiramatsu <mhiramat@kernel.org>
> Cc: linux-block@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> Cc: linux-trace-kernel@vger.kernel.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>   kernel/trace/blktrace.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
> index 918a7d12df8f..5743be559415 100644
> --- a/kernel/trace/blktrace.c
> +++ b/kernel/trace/blktrace.c
> @@ -320,8 +320,8 @@ static void blk_trace_free(struct request_queue *q, struct blk_trace *bt)
>   	 * under 'q->debugfs_dir', thus lookup and remove them.
>   	 */
>   	if (!bt->dir) {
> -		debugfs_remove(debugfs_lookup("dropped", q->debugfs_dir));
> -		debugfs_remove(debugfs_lookup("msg", q->debugfs_dir));
> +		debugfs_lookup_and_remove("dropped", q->debugfs_dir);
> +		debugfs_lookup_and_remove("msg", q->debugfs_dir);
>   	} else {
>   		debugfs_remove(bt->dir);
>   	}

Reviewed-by: Bart Van Assche <bvanassche@acm.org>