Skip to contentSkip to conversation

perf jevents: fix getting maximum number of fds

PATCH New Felix Fietkau 1 participant 1 message May 25, 2021 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf jevents: fix getting maximum number of fds

On some hosts, rlim.rlim_max can be returned as RLIM_INFINITY. By casting it to int, it is interpreted as -1, which will cause get_maxfds to return 0, causing "Invalid argument" errors in nftw() calls. Fix this by casting the second argument of min() to rlim_t instead.

Fixes 80eeb67fe577 ("perf jevents: Program to convert JSON file")
---
 tools/perf/pmu-events/jevents.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/pmu-events/jevents.c +1 -1
index ed4f0bd72e5a..412565027fbb 100644
@@ -960,7 +960,7 @@ static int get_maxfds(void)
 	struct rlimit rlim;
 
 	if (getrlimit(RLIMIT_NOFILE, &rlim) == 0)
-		return min((int)rlim.rlim_max / 2, 512);
+		return min(rlim.rlim_max / 2, (rlim_t)512);
 
 	return 512;
 }
Signature · 1 line
2.30.1