2015-05-13 11:15:36 +00:00
|
|
|
/*
|
2016-09-10 11:54:06 +00:00
|
|
|
* Copyright (C) 2015-2016 Dimitris Papastamos <sin@2f30.org>
|
2015-05-13 11:15:36 +00:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
|
2015-03-11 18:55:51 +00:00
|
|
|
#ifndef _FORTIFY_POLL_H
|
|
|
|
#define _FORTIFY_POLL_H
|
2015-02-28 12:10:41 +00:00
|
|
|
|
Don't use __extension__ in C++ code
A few important notes:
* __extension__ is a GNU C "alternate" keyword, not a C++ keyword.[1]
* __extension__ is designed to work on "expressions"; it does work on
#include_next in C mode, but it has no effect in C++ mode; the
warning will still appear, if enabled, even with __extension__
preceding #include_next. This is because #include_next is not
considered an expression in C++, so the compiler attaches
__extension__ to the first expression of the header.
All of this leads us to a build failure while building at least all
Mozilla software. Moz has an alternate -isystem dir searched before
/usr/include that overrides some headers, including <features.h>. The
first statement in each of these headers is a #pragma, and since
__extension__ is looking for an expression, and #pragma is a "null"
expression, we end up with the following error:
dist/system_wrappers/features.h:1:9: error: '#pragma' is not allowed here
Since __extension__ has no effect on #include_next in C++ mode anyway,
and since it can cause breakage, this commit omits __extension__ in C++
mode.
[1]: https://gcc.gnu.org/onlinedocs/gcc-6.4.0/gcc/Alternate-Keywords.html
2018-06-23 22:57:48 +00:00
|
|
|
#ifndef __cplusplus
|
2015-06-24 18:13:37 +00:00
|
|
|
__extension__
|
Don't use __extension__ in C++ code
A few important notes:
* __extension__ is a GNU C "alternate" keyword, not a C++ keyword.[1]
* __extension__ is designed to work on "expressions"; it does work on
#include_next in C mode, but it has no effect in C++ mode; the
warning will still appear, if enabled, even with __extension__
preceding #include_next. This is because #include_next is not
considered an expression in C++, so the compiler attaches
__extension__ to the first expression of the header.
All of this leads us to a build failure while building at least all
Mozilla software. Moz has an alternate -isystem dir searched before
/usr/include that overrides some headers, including <features.h>. The
first statement in each of these headers is a #pragma, and since
__extension__ is looking for an expression, and #pragma is a "null"
expression, we end up with the following error:
dist/system_wrappers/features.h:1:9: error: '#pragma' is not allowed here
Since __extension__ has no effect on #include_next in C++ mode anyway,
and since it can cause breakage, this commit omits __extension__ in C++
mode.
[1]: https://gcc.gnu.org/onlinedocs/gcc-6.4.0/gcc/Alternate-Keywords.html
2018-06-23 22:57:48 +00:00
|
|
|
#endif
|
2015-02-28 12:10:41 +00:00
|
|
|
#include_next <poll.h>
|
|
|
|
|
|
|
|
#if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
|
2015-05-13 11:04:15 +00:00
|
|
|
#include "fortify-headers.h"
|
2015-02-28 12:10:41 +00:00
|
|
|
|
2015-03-13 23:09:15 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif
|
|
|
|
|
2015-03-13 11:00:46 +00:00
|
|
|
#undef poll
|
2015-03-11 09:26:11 +00:00
|
|
|
|
2015-06-03 17:27:01 +00:00
|
|
|
_FORTIFY_FN(poll) int poll(struct pollfd *__f, nfds_t __n, int __s)
|
2015-02-28 12:10:41 +00:00
|
|
|
{
|
2015-06-03 17:27:01 +00:00
|
|
|
__typeof__(sizeof 0) __b = __builtin_object_size(__f, 0);
|
2015-02-28 12:10:41 +00:00
|
|
|
|
2015-06-03 17:27:01 +00:00
|
|
|
if (__n > __b / sizeof(struct pollfd))
|
2015-02-28 12:10:41 +00:00
|
|
|
__builtin_trap();
|
2015-06-03 17:27:01 +00:00
|
|
|
return __orig_poll(__f, __n, __s);
|
2015-02-28 12:10:41 +00:00
|
|
|
}
|
|
|
|
|
2015-03-03 14:28:25 +00:00
|
|
|
#ifdef _GNU_SOURCE
|
2015-03-13 11:00:46 +00:00
|
|
|
#undef ppoll
|
2015-06-03 17:27:01 +00:00
|
|
|
_FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s,
|
|
|
|
const sigset_t *__m)
|
2015-03-03 14:28:25 +00:00
|
|
|
{
|
2015-06-03 17:27:01 +00:00
|
|
|
__typeof__(sizeof 0) __b = __builtin_object_size(__f, 0);
|
2015-03-03 14:28:25 +00:00
|
|
|
|
2015-06-03 17:27:01 +00:00
|
|
|
if (__n > __b / sizeof(struct pollfd))
|
2015-03-03 14:28:25 +00:00
|
|
|
__builtin_trap();
|
2015-06-03 17:27:01 +00:00
|
|
|
return __orig_ppoll(__f, __n, __s, __m);
|
2015-03-03 14:28:25 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2015-03-13 23:09:15 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
2015-03-11 09:26:11 +00:00
|
|
|
#endif
|
|
|
|
|
2015-02-28 12:10:41 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|