From b799f91dddb33467760c260e67d9cd86f53a829c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 13 Jul 2005 06:09:58 +0000 Subject: * stdlib/bits/stdlib.h: New file. * stdlib/stdlib.h: Include if fortification is requested. * Makefile (headers): Add bits/stdlib.h. * include/bits/stdlib.h: New file. * debug/Depend: New file. * debug/ptsname_r_chk.c: New file. * debug/realpath_chk.c: New file. * debug/wctomb_chk.c: New file. * debug/Makefile (routines): Add ptsname_r_chk, realpath_chk, and wctomb_chk. * debug/Versions: Export __ptsname_r_chk, __realpath_chk, and __wctomb_chk. * debug/tst-chk1.c: Add tests for __ptsname_r_chk, __realpath_chk, and __wctomb_chk. --- stdlib/Makefile | 2 +- stdlib/bits/stdlib.h | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ stdlib/stdlib.h | 6 +++++ 3 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 stdlib/bits/stdlib.h (limited to 'stdlib') diff --git a/stdlib/Makefile b/stdlib/Makefile index fafe606..8416631 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -23,7 +23,7 @@ subdir := stdlib headers := stdlib.h alloca.h monetary.h fmtmsg.h ucontext.h sys/ucontext.h \ inttypes.h stdint.h bits/wordsize.h bits/wchar.h \ - errno.h sys/errno.h bits/errno.h + errno.h sys/errno.h bits/errno.h bits/stdlib.h routines := \ atof atoi atol atoll \ diff --git a/stdlib/bits/stdlib.h b/stdlib/bits/stdlib.h new file mode 100644 index 0000000..e8286b0 --- /dev/null +++ b/stdlib/bits/stdlib.h @@ -0,0 +1,75 @@ +/* Checking macros for stdlib functions. + Copyright (C) 2005 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 _STDLIB_H +# error "Never include directly; use instead." +#endif + +extern char *__realpath_chk (__const char *__restrict __name, + char *__restrict __resolved, + size_t __resolvedlen) __THROW __wur; +extern char *__REDIRECT (__realpath_alias, (__const char *__restrict __name, + char *__restrict __resolved), + realpath) __THROW __wur; + +extern __always_inline __wur char * +realpath (const char *__name, char *__resolved) +{ + if (__bos (__resolved) != (size_t) -1) + return __realpath_chk (__name, __resolved, __bos (__resolved)); + + return __realpath_alias (__name, __resolved); +} + + +extern int __ptsname_r_chk (int __fd, char *__buf, size_t __buflen, + size_t __nreal) __THROW __nonnull ((2)); +extern int __REDIRECT (__ptsname_r_alias, (int __fd, char *__buf, + size_t __buflen), ptsname_r) + __THROW __nonnull ((2)); + +extern __always_inline int +ptsname_r (int __fd, char *__buf, size_t __buflen) +{ + if (__bos (__buf) != (size_t) -1 + && (!__builtin_constant_p (__buflen) || __buflen > __bos (__buf))) + return __ptsname_r_chk (__fd, __buf, __buflen, __bos (__buf)); + return __ptsname_r_alias (__fd, __buf, __buflen); +} + + +extern int __wctomb_chk (char *__s, wchar_t __wchar, size_t __buflen) + __THROW __wur; +extern int __REDIRECT (__wctomb_alias, (char *__s, wchar_t __wchar), wctomb) + __THROW __wur; + +extern __always_inline __wur int +wctomb (char *__s, wchar_t __wchar) +{ + /* We would have to include to get a definition of MB_LEN_MAX. + But this would only disturb the namespace. So we define our own + version here. */ +#define __STDLIB_MB_LEN_MAX 16 +#if defined MB_LEN_MAX && MB_LEN_MAX != __STDLIB_MB_LEN_MAX +# error "Assumed value of MB_LEN_MAX wrong" +#endif + if (__bos (__s) != (size_t) -1 && __STDLIB_MB_LEN_MAX > __bos (__s)) + return __wctomb_chk (__s, __wchar, __bos (__s)); + return __wctomb_alias (__s, __wchar); +} diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index 4a1571e..9e75e71 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -961,6 +961,12 @@ extern int getloadavg (double __loadavg[], int __nelem) __THROW __nonnull ((1)); #endif + +/* Define some macros helping to catch buffer overflows. */ +#if __USE_FORTIFY_LEVEL > 0 && !defined __cplusplus +# include +#endif + #endif /* don't just need malloc and calloc */ #undef __need_malloc_and_calloc -- cgit v1.1