mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
7fc03cf320
Continuing the fixes for linknamespace and localplt test failures with -Os that arise from functions not being inlined in that case, this patch fixes such failures for feof_unlocked. The usual approach is followed of adding __feof_unlocked (inlined when feof_unlocked is), making calls use it when required for namespace reasons, and using libc_hidden_proto / libc_hidden_weak for the feof_unlocked weak alias when only localplt but not namespace issues are involved. In the case of getaddrinfo.c, use of __feof_unlocked needs to be conditional since that code is also used in nscd (where __feof_unlocked is not available). Tested for x86_64 (both without -Os to make sure that case continues to work, and with -Os to make sure all the relevant linknamespace and localplt test failures are resolved). Because of other such failures that remain after this patch, neither of the bugs can yet be closed. [BZ #15105] [BZ #19463] * libio/feof_u.c (feof_unlocked): Rename to __feof_unlocked and define as weak alias of __feof_unlocked. Use libc_hidden_weak. * include/stdio.h (feof_unlocked): Use libc_hidden_proto. (__feof_unlocked): New declaration, and inline function if [__USE_EXTERN_INLINES]. * iconv/gconv_conf.c (read_conf_file): Call __feof_unlocked instead of feof_unlocked. * intl/localealias.c [_LIBC] (FEOF): Likewise. * nss/nsswitch.c (nss_parse_file): Likewise. * sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): Likewise. * time/getdate.c (__getdate_r): Likewise. * sysdeps/posix/getaddrinfo.c [IS_IN (libc)] (feof_unlocked): Define as macro to call __feof_unlocked.
103 lines
2.7 KiB
C
103 lines
2.7 KiB
C
/* Copyright (C) 2004-2018 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 <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdio_ext.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include "libio/libioP.h"
|
|
|
|
/* Return 1 if the whole area PTR .. PTR+SIZE is not writable.
|
|
Return -1 if it is writable. */
|
|
|
|
int
|
|
__readonly_area (const char *ptr, size_t size)
|
|
{
|
|
const void *ptr_end = ptr + size;
|
|
|
|
FILE *fp = fopen ("/proc/self/maps", "rce");
|
|
if (fp == NULL)
|
|
{
|
|
/* It is the system administrator's choice to not have /proc
|
|
available to this process (e.g., because it runs in a chroot
|
|
environment. Don't fail in this case. */
|
|
if (errno == ENOENT
|
|
/* The kernel has a bug in that a process is denied access
|
|
to the /proc filesystem if it is set[ug]id. There has
|
|
been no willingness to change this in the kernel so
|
|
far. */
|
|
|| errno == EACCES)
|
|
return 1;
|
|
return -1;
|
|
}
|
|
|
|
/* We need no locking. */
|
|
__fsetlocking (fp, FSETLOCKING_BYCALLER);
|
|
|
|
char *line = NULL;
|
|
size_t linelen = 0;
|
|
|
|
while (! __feof_unlocked (fp))
|
|
{
|
|
if (_IO_getdelim (&line, &linelen, '\n', fp) <= 0)
|
|
break;
|
|
|
|
char *p;
|
|
uintptr_t from = strtoul (line, &p, 16);
|
|
|
|
if (p == line || *p++ != '-')
|
|
break;
|
|
|
|
char *q;
|
|
uintptr_t to = strtoul (p, &q, 16);
|
|
|
|
if (q == p || *q++ != ' ')
|
|
break;
|
|
|
|
if (from < (uintptr_t) ptr_end && to > (uintptr_t) ptr)
|
|
{
|
|
/* Found an entry that at least partially covers the area. */
|
|
if (*q++ != 'r' || *q++ != '-')
|
|
break;
|
|
|
|
if (from <= (uintptr_t) ptr && to >= (uintptr_t) ptr_end)
|
|
{
|
|
size = 0;
|
|
break;
|
|
}
|
|
else if (from <= (uintptr_t) ptr)
|
|
size -= to - (uintptr_t) ptr;
|
|
else if (to >= (uintptr_t) ptr_end)
|
|
size -= (uintptr_t) ptr_end - from;
|
|
else
|
|
size -= to - from;
|
|
|
|
if (!size)
|
|
break;
|
|
}
|
|
}
|
|
|
|
fclose (fp);
|
|
free (line);
|
|
|
|
/* If the whole area between ptr and ptr_end is covered by read-only
|
|
VMAs, return 1. Otherwise return -1. */
|
|
return size == 0 ? 1 : -1;
|
|
}
|