[v1] perf drm_pmu: fix fd_dir leaks in for_each_drm_fdinfo_in_dir()

[PATCH] perf drm_pmu: fix fd_dir leaks in for_each_drm_fdinfo_in_dir()

zhaoguohan@kylinos.cn posted 1 patch 1 month, 3 weeks ago

Diff against v2 v3
Download mbox

There is a newer version of this series

tools/perf/util/drm_pmu.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[PATCH] perf drm_pmu: fix fd_dir leaks in for_each_drm_fdinfo_in_dir()

Posted by zhaoguohan@kylinos.cn 1 month, 3 weeks ago

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.

Signed-off-by: GuoHan Zhao <zhaoguohan@kylinos.cn>
---
 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..424a76d1a953 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 cleanup;
 	}
+
+cleanup:
 	if (fdinfo_dir_fd != -1)
 		close(fdinfo_dir_fd);
 	closedir(fd_dir);
-- 
2.43.0

Re: [PATCH] perf drm_pmu: fix fd_dir leaks in for_each_drm_fdinfo_in_dir()

Posted by Markus Elfring 1 month, 3 weeks ago

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

How do you think about to add any tags (like “Fixes” and “Cc”) accordingly?

Regards,
Markus