diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-09-08 19:48:47 -0400 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-09-08 19:48:47 -0400 |
| commit | a0f33f996f7986dbf37631a4577f8565b42df29e (patch) | |
| tree | 78c71a736d4bd75009abba7796f0e0aca78e47ec /misc | |
| parent | 762011fe9ffded81448be4dc50a2b27faaafe4c9 (diff) | |
| download | glibc-a0f33f996f7986dbf37631a4577f8565b42df29e.tar.gz glibc-a0f33f996f7986dbf37631a4577f8565b42df29e.tar.xz glibc-a0f33f996f7986dbf37631a4577f8565b42df29e.zip | |
Add range checking for FD_SET, FD_CLR, and FD_ISSET
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/Makefile | 3 | ||||
| -rw-r--r-- | misc/bits/select2.h | 34 | ||||
| -rw-r--r-- | misc/sys/select.h | 8 |
3 files changed, 43 insertions, 2 deletions
diff --git a/misc/Makefile b/misc/Makefile index 52b13daa72..6be2bc7f94 100644 --- a/misc/Makefile +++ b/misc/Makefile @@ -31,7 +31,8 @@ headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \ sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \ regexp.h bits/select.h bits/mman.h sys/xattr.h \ syslog.h sys/syslog.h \ - bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h + bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \ + bits/select2.h routines := brk sbrk sstk ioctl \ readv writev preadv preadv64 pwritev pwritev64 \ diff --git a/misc/bits/select2.h b/misc/bits/select2.h new file mode 100644 index 0000000000..27f42018f2 --- /dev/null +++ b/misc/bits/select2.h @@ -0,0 +1,34 @@ +/* Checking macros for select functions. + Copyright (C) 2011 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_SELECT_H +# error "Never include <bits/select2.h> directly; use <sys/select.h> instead." +#endif + +/* Helper functions to issue warnings and errors when needed. */ +extern unsigned long int __fdelt_chk (unsigned long int __d); +extern unsigned long int __fdelt_warn (unsigned long int __d) + __warnattr ("bit outside of fd_set selected"); +#undef __FDELT +#define __FDELT(d) \ + ({ unsigned long int __d = d; \ + (__builtin_constant_p (__d) \ + ? (__d >= __FD_SETSIZE \ + ? __fdelt_warn (__d) : (__d / __NFDBITS)) \ + : __fdelt_chk (__d)); }) diff --git a/misc/sys/select.h b/misc/sys/select.h index f4a37be551..295d3bb6c4 100644 --- a/misc/sys/select.h +++ b/misc/sys/select.h @@ -1,5 +1,5 @@ /* `fd_set' type and related macros, and `select'/`pselect' declarations. - Copyright (C) 1996-2003, 2009 Free Software Foundation, Inc. + Copyright (C) 1996-2003, 2009, 2011 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 @@ -125,6 +125,12 @@ extern int pselect (int __nfds, fd_set *__restrict __readfds, const __sigset_t *__restrict __sigmask); #endif + +/* Define some inlines helping to catch common problems. */ +#if __USE_FORTIFY_LEVEL > 0 && defined __GNUC__ +# include <bits/select2.h> +#endif + __END_DECLS #endif /* sys/select.h */ |