use prlimit syscall for getrlimit/setrlimit

this allows the full range of 64-bit limit arguments even on 32-bit
systems. fallback to the old syscalls on old kernels that don't
support prlimit.
This commit is contained in:
Rich Felker 2012-01-20 22:30:52 -05:00
parent 26f38328d6
commit 5235a2a5a4
2 changed files with 14 additions and 4 deletions

View File

@ -1,14 +1,18 @@
#include <sys/resource.h> #include <sys/resource.h>
#include <errno.h>
#include "syscall.h" #include "syscall.h"
#include "libc.h" #include "libc.h"
int getrlimit(int resource, struct rlimit *rlim) int getrlimit(int resource, struct rlimit *rlim)
{ {
long k_rlim[2]; unsigned long k_rlim[2];
int ret = syscall(SYS_prlimit64, 0, resource, 0, rlim);
if (!ret || errno != ENOSYS)
return ret;
if (syscall(SYS_getrlimit, resource, k_rlim) < 0) if (syscall(SYS_getrlimit, resource, k_rlim) < 0)
return -1; return -1;
rlim->rlim_cur = k_rlim[0] == -1 ? -1 : (unsigned long)k_rlim[0]; rlim->rlim_cur = k_rlim[0] == -1UL ? RLIM_INFINITY : k_rlim[0];
rlim->rlim_max = k_rlim[1] == -1 ? -1 : (unsigned long)k_rlim[1]; rlim->rlim_max = k_rlim[1] == -1UL ? RLIM_INFINITY : k_rlim[1];
return 0; return 0;
} }

View File

@ -3,9 +3,15 @@
#include "syscall.h" #include "syscall.h"
#include "libc.h" #include "libc.h"
#define MIN(a, b) ((a)<(b) ? (a) : (b))
int __setrlimit(int resource, const struct rlimit *rlim) int __setrlimit(int resource, const struct rlimit *rlim)
{ {
long k_rlim[2] = { rlim->rlim_cur, rlim->rlim_max }; unsigned long k_rlim[2];
int ret = __syscall(SYS_prlimit64, 0, resource, rlim, 0);
if (ret != -ENOSYS) return ret;
k_rlim[0] = MIN(rlim->rlim_cur, -1UL);
k_rlim[1] = MIN(rlim->rlim_max, -1UL);
return __syscall(SYS_setrlimit, resource, k_rlim); return __syscall(SYS_setrlimit, resource, k_rlim);
} }