mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-16 07:21:57 +03:00
a748eb31c1
This patch consolidates all the non cancellable read calls to use the __read_nocancel identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Also, since it is used on libcrypto it is also exported in GLIBC_PRIVATE namespace. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * sysdeps/generic/not-cancel.h (read_not_cancel): Remove macro. (__read_nocancel): New macro. * sysdeps/unix/sysv/linux/Versions (libc) [GLIBC_PRIVATE]: Add __read_nocancel. * sysdeps/unix/sysv/linux/not-cancel.h (__read_nocancel): Remove macro. (__read_nocancel): New prototype. * sysdeps/unix/sysv/linux/read.c (__read_nocancel): New function. * catgets/open_catalog.c (__open_catalog): Replace read_not_cancel with __read_nocancel. * intl/loadmsgcat.c (read): Likewise. * libio/fileops.c (_IO_file_read): Likewise. * locale/loadlocale.c (_nl_load_locale): Likewise. * login/utmp_file.c (getutent_r_file): Likewise. (internal_getut_r): Likewise. (getutline_r_file): Likewise. * sysdeps/unix/sysv/linux/fips-private.h (fips_enable_p): Likewise. * sysdeps/unix/sysv/linux/gethostid.c (gethostid): Likewise. * sysdeps/unix/sysv/linux/getloadavg.c (getloadavg): Likewise. * sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid): Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (next_line): Likewise. * sysdeps/unix/sysv/linux/i386/smp.h (is_smp_system): Likewise. * sysdeps/unix/sysv/linux/ia64/has_cpuclock.c (has_cpuclock): Likewise. * sysdeps/unix/sysv/linux/libc_fatal.c (backtrace_and_maps): Likewise. * sysdeps/unix/sysv/linux/malloc-sysdep.h (check_may_shrink_heap): Likewise. * sysdeps/unix/sysv/linux/pthread_getname.c (pthread_getname_np): Likewise. * sysdeps/unix/sysv/linux/sysconf.c (__sysconf): Likewise.
60 lines
2.2 KiB
C
60 lines
2.2 KiB
C
/* System-specific malloc support functions. Linux version.
|
|
Copyright (C) 2012-2017 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 <fcntl.h>
|
|
#include <not-cancel.h>
|
|
|
|
/* The Linux kernel overcommits address space by default and if there is not
|
|
enough memory available, it uses various parameters to decide the process to
|
|
kill. It is however possible to disable or curb this overcommit behavior
|
|
by setting the proc sysctl vm.overcommit_memory to the value '2' and with
|
|
that, a process is only allowed to use the maximum of a pre-determined
|
|
fraction of the total address space. In such a case, we want to make sure
|
|
that we are judicious with our heap usage as well, and explicitly give away
|
|
the freed top of the heap to reduce our commit charge. See the proc(5) man
|
|
page to know more about overcommit behavior.
|
|
|
|
Other than that, we also force an unmap in a secure exec. */
|
|
static inline bool
|
|
check_may_shrink_heap (void)
|
|
{
|
|
static int may_shrink_heap = -1;
|
|
|
|
if (__builtin_expect (may_shrink_heap >= 0, 1))
|
|
return may_shrink_heap;
|
|
|
|
may_shrink_heap = __libc_enable_secure;
|
|
|
|
if (__builtin_expect (may_shrink_heap == 0, 1))
|
|
{
|
|
int fd = __open_nocancel ("/proc/sys/vm/overcommit_memory",
|
|
O_RDONLY | O_CLOEXEC);
|
|
if (fd >= 0)
|
|
{
|
|
char val;
|
|
ssize_t n = __read_nocancel (fd, &val, 1);
|
|
may_shrink_heap = n > 0 && val == '2';
|
|
close_not_cancel_no_status (fd);
|
|
}
|
|
}
|
|
|
|
return may_shrink_heap;
|
|
}
|
|
|
|
#define HAVE_MREMAP 1
|