summaryrefslogtreecommitdiff
path: root/io
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2012-01-08 11:55:32 -0500
committerUlrich Drepper <drepper@gmail.com>2012-01-08 11:55:32 -0500
commitd9a216c037590c414e4069afde01fde84794e0d6 (patch)
tree0c4cbf65be6c1a788741977cbd383def08406a78 /io
parent15cfed3f93f60e79508043047065f189754f8e35 (diff)
downloadglibc-d9a216c037590c414e4069afde01fde84794e0d6.tar.gz
Add checking versions of poll and ppoll
Diffstat (limited to 'io')
-rw-r--r--io/bits/poll2.h78
-rw-r--r--io/ppoll.c3
-rw-r--r--io/sys/poll.h6
3 files changed, 86 insertions, 1 deletions
diff --git a/io/bits/poll2.h b/io/bits/poll2.h
new file mode 100644
index 0000000000..7a9dd8a30b
--- /dev/null
+++ b/io/bits/poll2.h
@@ -0,0 +1,78 @@
+/* Checking macros for poll functions.
+ Copyright (C) 2012 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _SYS_POLL_H
+# error "Never include <bits/poll2.h> directly; use <sys/poll.h> instead."
+#endif
+
+
+extern int __REDIRECT (__poll_alias, (struct pollfd *__fds, nfds_t __nfds,
+ int __timeout), poll);
+extern int __poll_chk (struct pollfd *__fds, nfds_t __nfds, int __timeout,
+ __SIZE_TYPE__ __fdslen);
+extern int __REDIRECT (__poll_chk_warn, (struct pollfd *__fds, nfds_t __nfds,
+ int __timeout, __SIZE_TYPE__ __fdslen),
+ __poll_chk)
+ __warnattr ("poll called with fds buffer too small file nfds entries");
+
+__extern_always_inline int
+poll (struct pollfd *__fds, nfds_t __nfds, int __timeout)
+{
+ if (__bos (__fds) != (__SIZE_TYPE__) -1)
+ {
+ if (! __builtin_constant_p (__nfds))
+ return __poll_chk (__fds, __nfds, __timeout, __bos (__fds));
+ else if (__bos (__fds) / sizeof (*__fds) < __nfds)
+ return __poll_chk_warn (__fds, __nfds, __timeout, __bos (__fds));
+ }
+
+ return __poll_alias (__fds, __nfds, __timeout);
+}
+
+
+#ifdef __USE_GNU
+extern int __REDIRECT (__ppoll_alias, (struct pollfd *__fds, nfds_t __nfds,
+ const struct timespec *__timeout,
+ const __sigset_t *__ss), ppoll);
+extern int __ppoll_chk (struct pollfd *__fds, nfds_t __nfds,
+ const struct timespec *__timeout,
+ const __sigset_t *__ss, __SIZE_TYPE__ __fdslen);
+extern int __REDIRECT (__ppoll_chk_warn, (struct pollfd *__fds, nfds_t __nfds,
+ const struct timespec *__timeout,
+ const __sigset_t *__ss,
+ __SIZE_TYPE__ __fdslen),
+ __ppoll_chk)
+ __warnattr ("ppoll called with fds buffer too small file nfds entries");
+
+__extern_always_inline int
+ppoll (struct pollfd *__fds, nfds_t __nfds, const struct timespec *__timeout,
+ const __sigset_t *__ss)
+{
+ if (__bos (__fds) != (__SIZE_TYPE__) -1)
+ {
+ if (! __builtin_constant_p (__nfds))
+ return __ppoll_chk (__fds, __nfds, __timeout, __ss, __bos (__fds));
+ else if (__bos (__fds) / sizeof (*__fds) < __nfds)
+ return __ppoll_chk_warn (__fds, __nfds, __timeout, __ss,
+ __bos (__fds));
+ }
+
+ return __ppoll_alias (__fds, __nfds, __timeout, __ss);
+}
+#endif
diff --git a/io/ppoll.c b/io/ppoll.c
index a035cfeb1f..b161a47b3d 100644
--- a/io/ppoll.c
+++ b/io/ppoll.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2006.
@@ -73,4 +73,5 @@ ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
#ifndef ppoll
/* __poll handles cancellation. */
LIBC_CANCEL_HANDLED ();
+libc_hidden_def (ppoll);
#endif
diff --git a/io/sys/poll.h b/io/sys/poll.h
index a9bd18005a..c0a7e04099 100644
--- a/io/sys/poll.h
+++ b/io/sys/poll.h
@@ -71,4 +71,10 @@ extern int ppoll (struct pollfd *__fds, nfds_t __nfds,
__END_DECLS
+
+/* Define some inlines helping to catch common problems. */
+#if __USE_FORTIFY_LEVEL > 0 && defined __extern_always_inline
+# include <bits/poll2.h>
+#endif
+
#endif /* sys/poll.h */