mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 08:46:46 +00:00
perf jevents: Fix getting maximum number of fds
commit75ea44e356
upstream. 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:80eeb67fe5
("perf jevents: Program to convert JSON file") Signed-off-by: Felix Fietkau <nbd@nbd.name> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Link: http://lore.kernel.org/lkml/20210525160758.97829-1-nbd@nbd.name Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
77ac90814b
commit
bd7a3b3ed9
1 changed files with 1 additions and 1 deletions
|
@ -862,7 +862,7 @@ static int get_maxfds(void)
|
||||||
struct rlimit rlim;
|
struct rlimit rlim;
|
||||||
|
|
||||||
if (getrlimit(RLIMIT_NOFILE, &rlim) == 0)
|
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;
|
return 512;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue