diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/setrlimit.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/setrlimit.c | 67 |
1 files changed, 41 insertions, 26 deletions
diff --git a/sysdeps/unix/sysv/linux/setrlimit.c b/sysdeps/unix/sysv/linux/setrlimit.c index 43bfdbbbc4..882f0c55cc 100644 --- a/sysdeps/unix/sysv/linux/setrlimit.c +++ b/sysdeps/unix/sysv/linux/setrlimit.c @@ -27,52 +27,67 @@ extern int __syscall_setrlimit (unsigned int resource, const struct rlimit *rlimits); +extern int __syscall_ugetrlimit (unsigned int resource, + const struct rlimit *rlimits); /* Linux 2.3.25 introduced a new system call since the types used for the limits are now unsigned. */ -#if !defined __ASSUME_NEW_GETRLIMIT_SYSCALL && defined __NR_ugetrlimit -static int no_new_getrlimit; -#else -# define no_new_getrlimit 0 +#if defined __NR_ugetrlimit && !defined __ASSUME_NEW_GETRLIMIT_SYSCALL +extern int __have_no_new_getrlimit; /* from getrlimit.c */ #endif int -__setrlimit (resource, rlimits) - enum __rlimit_resource resource; - const struct rlimit *rlimits; +__new_setrlimit (enum __rlimit_resource resource, const struct rlimit *rlimits) { -#ifndef __ASSUME_NEW_GETRLIMIT_SYSCALL +#ifdef __ASSUME_NEW_GETRLIMIT_SYSCALL + return INLINE_SYSCALL (setrlimit, 2, resource, rlimits); +#else struct rlimit rlimits_small; -#endif -#ifdef __NR_ugetrlimit - if (! no_new_getrlimit) +# ifdef __NR_ugetrlimit + if (__have_no_new_getrlimit <= 0) { int result = INLINE_SYSCALL (setrlimit, 2, resource, rlimits); -# ifndef __ASSUME_NEW_GETRLIMIT_SYSCALL - /* If the system call is available return. */ - if (result != -1 || errno != ENOSYS) -# endif + /* Return if the values are not out of range or if we positively + know that the ugetrlimit system call exists. */ + if (result != -1 || errno != EINVAL || __have_no_new_getrlimit < 0) return result; -# ifndef __ASSUME_NEW_GETRLIMIT_SYSCALL - /* Remember that the system call is not available. */ - no_new_getrlimit = 1; -# endif + /* Check if the new ugetrlimit syscall exists. */ + if (INLINE_SYSCALL (ugetrlimit, 2, resource, &rlimits_small) != -1 + || errno != ENOSYS) + { + /* There was some other error, probably RESOURCE out of range. + Remember that the ugetrlimit system call really exists. */ + __have_no_new_getrlimit = -1; + /* Restore previous errno value. */ + __set_errno (EINVAL); + return result; + } + + /* Remember that the kernel uses the old interface. */ + __have_no_new_getrlimit = 1; } -#endif +# endif -#ifndef __ASSUME_NEW_GETRLIMIT_SYSCALL /* We might have to correct the limits values. Since the old values - were signed the new values are too large. */ + were signed the new values might be too large. */ rlimits_small.rlim_cur = MIN ((unsigned long int) rlimits->rlim_cur, - RLIM_INFINITY >> 2); + RLIM_INFINITY >> 1); rlimits_small.rlim_max = MIN ((unsigned long int) rlimits->rlim_max, - RLIM_INFINITY >> 2); + RLIM_INFINITY >> 1); - /* Fall back on the old system call. */ + /* Try again with the adjusted values. */ return INLINE_SYSCALL (setrlimit, 2, resource, &rlimits_small); #endif } -weak_alias (__setrlimit, setrlimit) + +#if defined PIC && DO_VERSIONING +default_symbol_version (__new_setrlimit, __setrlimit, GLIBC_2.1.3); +strong_alias (__new_setrlimit, _new_setrlimit); +default_symbol_version (_new_setrlimit, setrlimit, GLIBC_2.1.3); +#else +weak_alias (__new_setrlimit, __setrlimit); +weak_alias (__new_setrlimit, setrlimit); +#endif |