9e65ae387c
First, we should never check the size of __s if __l == 0 since the array is not going to be modified in that case. Second, negative __l is a well-defined error case (EINVAL) and we should never trap on a conforming code like this: r = getgroups(-1, NULL); if (r == -1) ... An example of non-desired behaviour for negative __l is the gnulib configure script which checks for getgroups(-1, ...) to catch some ancient FreeBSD kernel bug. The conftest binary traps even on good system (e.g. linux/musl) and the unnecessary getgroups wrapper is enforced for any project that uses gnulib. This patch also changes the size_t cast to avoid the explicit zero extension on systems where size_t differs from unsigned int.
162 lines
3.6 KiB
C
162 lines
3.6 KiB
C
/*
|
|
* Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|
|
#ifndef _FORTIFY_UNISTD_H
|
|
#define _FORTIFY_UNISTD_H
|
|
|
|
#ifndef __cplusplus
|
|
__extension__
|
|
#endif
|
|
#include_next <unistd.h>
|
|
|
|
#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
|
|
#include "fortify-headers.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#undef confstr
|
|
#undef getcwd
|
|
#undef getgroups
|
|
#undef gethostname
|
|
#undef getlogin_r
|
|
#undef pread
|
|
#undef read
|
|
#undef readlink
|
|
#undef readlinkat
|
|
#undef ttyname_r
|
|
#undef write
|
|
|
|
_FORTIFY_FN(confstr) size_t confstr(int __n, char *__s, size_t __l)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
size_t __r = __orig_confstr(__n, __s, __b > __l ? __l : __b);
|
|
|
|
if (__l > __b && __r > __b)
|
|
__builtin_trap();
|
|
return __r;
|
|
}
|
|
|
|
_FORTIFY_FN(getcwd) char *getcwd(char *__s, size_t __l)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__l > __b)
|
|
__builtin_trap();
|
|
return __orig_getcwd(__s, __l);
|
|
}
|
|
|
|
#if defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
|
|
#undef getdomainname
|
|
_FORTIFY_FN(getdomainname) int getdomainname(char *__s, size_t __l)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__l > __b)
|
|
__builtin_trap();
|
|
return __orig_getdomainname(__s, __l);
|
|
}
|
|
#endif
|
|
|
|
_FORTIFY_FN(getgroups) int getgroups(int __l, gid_t *__s)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__l > 0 && (unsigned)__l > __b / sizeof(gid_t))
|
|
__builtin_trap();
|
|
return __orig_getgroups(__l, __s);
|
|
}
|
|
|
|
_FORTIFY_FN(gethostname) int gethostname(char *__s, size_t __l)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__l > __b)
|
|
__builtin_trap();
|
|
return __orig_gethostname(__s, __l);
|
|
}
|
|
|
|
_FORTIFY_FN(getlogin_r) int getlogin_r(char *__s, size_t __l)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__l > __b)
|
|
__builtin_trap();
|
|
return __orig_getlogin_r(__s, __l);
|
|
}
|
|
|
|
_FORTIFY_FN(pread) ssize_t pread(int __f, void *__s, size_t __n, off_t __o)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__n > __b)
|
|
__builtin_trap();
|
|
return __orig_pread(__f, __s, __n, __o);
|
|
}
|
|
|
|
_FORTIFY_FN(read) ssize_t read(int __f, void *__s, size_t __n)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__n > __b)
|
|
__builtin_trap();
|
|
return __orig_read(__f, __s, __n);
|
|
}
|
|
|
|
_FORTIFY_FN(readlink) ssize_t readlink(const char *__p, char *__s, size_t __n)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__n > __b)
|
|
__builtin_trap();
|
|
return __orig_readlink(__p, __s, __n);
|
|
}
|
|
|
|
_FORTIFY_FN(readlinkat) ssize_t readlinkat(int __f, const char *__p, char *__s, size_t __n)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__n > __b)
|
|
__builtin_trap();
|
|
return __orig_readlinkat(__f, __p, __s, __n);
|
|
}
|
|
|
|
_FORTIFY_FN(ttyname_r) int ttyname_r(int __f, char *__s, size_t __n)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__n > __b)
|
|
__builtin_trap();
|
|
return __orig_ttyname_r(__f, __s, __n);
|
|
}
|
|
|
|
_FORTIFY_FN(write) ssize_t write(int __f, const void *__s, size_t __n)
|
|
{
|
|
size_t __b = __builtin_object_size(__s, 0);
|
|
|
|
if (__n > __b)
|
|
__builtin_trap();
|
|
return __orig_write(__f, __s, __n);
|
|
}
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#endif
|