trace/blktrace: fix memory leak with using debugfs_lookup()
Subsystems (2)
PATCH 1/1 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.
--- kernel/trace/blktrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/trace/blktrace.c +2 -2
@@ -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); }
Signature · 1 line
2.39.1
Quoted 21 lines · Greg Kroah-Hartman
When calling
debugfs_lookup()the result must havedput()called on it, otherwise the memory will leak over time. To make things simpler, just calldebugfs_lookup_and_remove()instead which handles all of the logic at once.Cc Jens Axboe <[email protected]>Cc Steven Rostedt <[email protected]>Cc Masami Hiramatsu <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- kernel/trace/blktrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)kernel/trace/blktrace.c +0
-0
kernel/trace/blktrace.c static void blk_trace_free(struct request_queue *q, struct blk_trace *bt) · line 327
Quoted 10 lines
kernel/trace/blktrace.c +2
-2@@ -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); }
Quoted 6 lines · Greg Kroah-Hartman
When calling
debugfs_lookup()the result must havedput()called on it, otherwise the memory will leak over time. To make things simpler, just calldebugfs_lookup_and_remove()instead which handles all of the logic at once.
Applied, thanks!
[1/1] trace/blktrace: fix memory leak with using debugfs_lookup()
commit: 83e8864fee26f63a7435e941b7c36a20fd6fe93e
Best regards,
Signature · 1 line
Jens Axboe