Skip to content

Commit 83e8864

Browse files
gregkhaxboe
authored andcommitted
trace/blktrace: fix memory leak with using debugfs_lookup()
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> Reviewed-by: Bart Van Assche <bvanassche@acm.org> Link: https://lore.kernel.org/r/20230202141956.2299521-1-gregkh@linuxfoundation.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 01542f6 commit 83e8864

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/trace/blktrace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,8 @@ static void blk_trace_free(struct request_queue *q, struct blk_trace *bt)
320320
* under 'q->debugfs_dir', thus lookup and remove them.
321321
*/
322322
if (!bt->dir) {
323-
debugfs_remove(debugfs_lookup("dropped", q->debugfs_dir));
324-
debugfs_remove(debugfs_lookup("msg", q->debugfs_dir));
323+
debugfs_lookup_and_remove("dropped", q->debugfs_dir);
324+
debugfs_lookup_and_remove("msg", q->debugfs_dir);
325325
} else {
326326
debugfs_remove(bt->dir);
327327
}

0 commit comments

Comments
 (0)