From: GuoHan Zhao <zhaoguohan@kylinos.cn>

Fix file descriptor leak when callback function returns error. The
function was directly returning without closing fdinfo_dir_fd and
fd_dir when cb() returned non-zero value.

Fixes: 28917cb17f9d ("perf drm_pmu: Add a tool like PMU to expose DRM information")
Reviewed-by: Ian Rogers <irogers@google.com>
Reviewed-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Markus Elfring <Markus.Elfring@web.de>
Signed-off-by: GuoHan Zhao <zhaoguohan@kylinos.cn>
---
v2 -> v3: replaced "cleanup" with "close_fdinfo"
v1 -> v2: Added the Fixes tag in commit message
---
 tools/perf/util/drm_pmu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/drm_pmu.c b/tools/perf/util/drm_pmu.c
index 988890f37ba7..98d4d2b556d4 100644
--- a/tools/perf/util/drm_pmu.c
+++ b/tools/perf/util/drm_pmu.c
@@ -458,8 +458,10 @@ static int for_each_drm_fdinfo_in_dir(int (*cb)(void *args, int fdinfo_dir_fd, c
 		}
 		ret = cb(args, fdinfo_dir_fd, fd_entry->d_name);
 		if (ret)
-			return ret;
+			goto close_fdinfo;
 	}
+
+close_fdinfo:
 	if (fdinfo_dir_fd != -1)
 		close(fdinfo_dir_fd);
 	closedir(fd_dir);
-- 
2.43.0

On Mon, Sep 08, 2025 at 02:52:03PM +0800, zhaoguohan@kylinos.cn wrote:
> From: GuoHan Zhao <zhaoguohan@kylinos.cn>
> 
> Fix file descriptor leak when callback function returns error. The
> function was directly returning without closing fdinfo_dir_fd and
> fd_dir when cb() returned non-zero value.

Thanks, applying to perf-tools-next.

- Arnaldo
 
> Fixes: 28917cb17f9d ("perf drm_pmu: Add a tool like PMU to expose DRM information")
> Reviewed-by: Ian Rogers <irogers@google.com>
> Reviewed-by: Namhyung Kim <namhyung@kernel.org>
> Reviewed-by: Markus Elfring <Markus.Elfring@web.de>
> Signed-off-by: GuoHan Zhao <zhaoguohan@kylinos.cn>
> ---
> v2 -> v3: replaced "cleanup" with "close_fdinfo"
> v1 -> v2: Added the Fixes tag in commit message
> ---
>  tools/perf/util/drm_pmu.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/perf/util/drm_pmu.c b/tools/perf/util/drm_pmu.c
> index 988890f37ba7..98d4d2b556d4 100644
> --- a/tools/perf/util/drm_pmu.c
> +++ b/tools/perf/util/drm_pmu.c
> @@ -458,8 +458,10 @@ static int for_each_drm_fdinfo_in_dir(int (*cb)(void *args, int fdinfo_dir_fd, c
>  		}
>  		ret = cb(args, fdinfo_dir_fd, fd_entry->d_name);
>  		if (ret)
> -			return ret;
> +			goto close_fdinfo;
>  	}
> +
> +close_fdinfo:
>  	if (fdinfo_dir_fd != -1)
>  		close(fdinfo_dir_fd);
>  	closedir(fd_dir);
> -- 
> 2.43.0

> Fix file descriptor leak when callback function returns error. The
…

Would it be nicer to move the last word into the next text line?


…> +++ b/tools/perf/util/drm_pmu.c
> @@ -458,8 +458,10 @@ static int for_each_drm_fdinfo_in_dir(int (*cb)(void *args, int fdinfo_dir_fd, c
>  		}
>  		ret = cb(args, fdinfo_dir_fd, fd_entry->d_name);
…> +close_fdinfo:
>  	if (fdinfo_dir_fd != -1)

May a repeated check be avoided here?


>  		close(fdinfo_dir_fd);

How do you think about to use such a label directly before
the function call?


>  	closedir(fd_dir);


Regards,
Markus