mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00: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.
69 lines
2.2 KiB
C
69 lines
2.2 KiB
C
/* Catastrophic failure reports. Linux version.
|
|
Copyright (C) 1993-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 <errno.h>
|
|
#include <execinfo.h>
|
|
#include <fcntl.h>
|
|
#include <not-cancel.h>
|
|
#include <string.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/uio.h>
|
|
|
|
static bool
|
|
writev_for_fatal (int fd, const struct iovec *iov, size_t niov, size_t total)
|
|
{
|
|
INTERNAL_SYSCALL_DECL (err);
|
|
ssize_t cnt;
|
|
do
|
|
cnt = INTERNAL_SYSCALL (writev, err, 3, fd, iov, niov);
|
|
while (INTERNAL_SYSCALL_ERROR_P (cnt, err)
|
|
&& INTERNAL_SYSCALL_ERRNO (cnt, err) == EINTR);
|
|
return cnt == total;
|
|
}
|
|
#define WRITEV_FOR_FATAL writev_for_fatal
|
|
|
|
static void
|
|
backtrace_and_maps (int do_abort, bool written, int fd)
|
|
{
|
|
if (do_abort > 1 && written)
|
|
{
|
|
void *addrs[64];
|
|
#define naddrs (sizeof (addrs) / sizeof (addrs[0]))
|
|
int n = __backtrace (addrs, naddrs);
|
|
if (n > 2)
|
|
{
|
|
#define strnsize(str) str, strlen (str)
|
|
#define writestr(str) write_not_cancel (fd, str)
|
|
writestr (strnsize ("======= Backtrace: =========\n"));
|
|
__backtrace_symbols_fd (addrs + 1, n - 1, fd);
|
|
|
|
writestr (strnsize ("======= Memory map: ========\n"));
|
|
int fd2 = __open_nocancel ("/proc/self/maps", O_RDONLY);
|
|
char buf[1024];
|
|
ssize_t n2;
|
|
while ((n2 = __read_nocancel (fd2, buf, sizeof (buf))) > 0)
|
|
if (write_not_cancel (fd, buf, n2) != n2)
|
|
break;
|
|
close_not_cancel_no_status (fd2);
|
|
}
|
|
}
|
|
}
|
|
#define BEFORE_ABORT backtrace_and_maps
|
|
|
|
#include <sysdeps/posix/libc_fatal.c>
|