mirror of
https://sourceware.org/git/glibc.git
synced 2025-10-30 10:45:40 +03:00
1a2325c06c
posix_spawn (a standard POSIX function) brings in a use of getrlimit64 (not a standard POSIX function). This patch fixes this by using __getrlimit64 and making getrlimit64 a weak alias. This is more complicated than some such changes because of files that define getrlimit64 in their own way using symbol versioning after including the main sysdeps/unix/sysv/linux/getrlimit64.c with a getrlimit macro defined. There are various existing patterns for such cases in glibc; the one I've used here is that a getrlimit64 macro disables the weak_alias / libc_hidden_weak calls, leaving it to the including file to define the getrlimit64 name in whatever way is appropriate. Tested for x86_64 and x86 that installed stripped shared libraries are unchanged by this patch. [BZ #17991] * include/sys/resource.h (__getrlimit64): Declare. Use libc_hidden_proto. * resource/getrlimit64.c (getrlimit64): Rename to __getrlimit64 and define as weak alias of __getrlimit64. Use libc_hidden_weak. * sysdeps/posix/spawni.c (__spawni): Call __getrlimit64 instead of getrlimit64. * sysdeps/unix/sysv/linux/getrlimit64.c (getrlimit64): Rename to __getrlimit64. [!getrlimit64] (getrlimit64): Define as weak alias of __getrlimit64. Use libc_hidden_weak. * sysdeps/unix/sysv/linux/i386/getrlimit64.c (getrlimit64): Define using __getrlimit64 not __new_getrlimit64. (__GI_getrlimit64): Likewise. * sysdeps/unix/sysv/linux/mips/getrlimit64.c (getrlimit64): Likewise. (__GI_getrlimit64): Likewise. (__old_getrlimit64): Use __getrlimit64 not __new_getrlimit64. * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list (getrlimit): Add __getrlimit64 alias. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (getrlimit): Likewise. * conform/Makefile (test-xfail-XOPEN2K/spawn.h/linknamespace): Remove variable. (test-xfail-POSIX2008/spawn.h/linknamespace): Likewise. (test-xfail-XOPEN2K8/spawn.h/linknamespace): Likewise.
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/* Copyright (C) 2013-2015 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <sgidefs.h>
|
|
|
|
#if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32
|
|
|
|
# include <shlib-compat.h>
|
|
|
|
# define getrlimit64 __new_getrlimit64
|
|
# include <sysdeps/unix/sysv/linux/getrlimit64.c>
|
|
# undef getrlimit64
|
|
|
|
versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_19);
|
|
strong_alias (__getrlimit64, __GI_getrlimit64)
|
|
|
|
# if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_19)
|
|
|
|
/* RLIM64_INFINITY was supposed to be a glibc convention rather than
|
|
anything seen by the kernel, but it ended being passed to the kernel
|
|
through the prlimit64 syscall. Given that a lot of binaries with
|
|
the wrong constant value are in the wild, provide a wrapper function
|
|
fixing the value after the syscall. */
|
|
|
|
# define OLD_RLIM64_INFINITY 0x7fffffffffffffffULL
|
|
|
|
int
|
|
attribute_compat_text_section
|
|
__old_getrlimit64 (enum __rlimit_resource resource,
|
|
struct rlimit64 *rlimits)
|
|
{
|
|
struct rlimit64 krlimits;
|
|
|
|
if (__getrlimit64 (resource, &krlimits) < 0)
|
|
return -1;
|
|
|
|
if (krlimits.rlim_cur == RLIM64_INFINITY)
|
|
rlimits->rlim_cur = OLD_RLIM64_INFINITY;
|
|
else
|
|
rlimits->rlim_cur = krlimits.rlim_cur;
|
|
if (krlimits.rlim_max == RLIM64_INFINITY)
|
|
rlimits->rlim_max = OLD_RLIM64_INFINITY;
|
|
else
|
|
rlimits->rlim_max = krlimits.rlim_max;
|
|
|
|
return 0;
|
|
}
|
|
|
|
compat_symbol (libc, __old_getrlimit64, getrlimit64, GLIBC_2_2);
|
|
# endif
|
|
|
|
#else /* !_ABI_O32 && !_ABI_N32 */
|
|
# include <sysdeps/unix/sysv/linux/getrlimit64.c>
|
|
#endif
|