mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
2ed5fd9a2a
2000-07-26 Greg McGary <greg@mcgary.org> * Makeconfig (+link-bounded, link-libc-bounded, link-extra-libs-bounded): New variables. (built-program-cmd): Omit $(run-program-prefix) for static BP tests. * Makerules (do-tests-clean, common-mostlyclean): Remove BP test files. * Rules (tests-bp.out): New variable. (tests): Conditionally add BP tests. (binaries-bounded): Add variable and associated rule. * csu/Makefile [build-bounded] (extra-objs, install-lib): Move conditional stuff after place where condition is defined. * malloc/malloc.c (bp-checks.h): Add #include. (mem2chunk, chunk_at_offset, bin_at): Wrap BOUNDED_1 around expression. (_bin_at): Add unbounded version of bin_at. (IAV, chunk_alloc): Use unbounded _bin_at. (mALLOc, rEALLOc, chunk_realloc, mEMALIGn, cALLOc, chunk2mem_check, realloc_check, malloc_starter, malloc_atfork): Wrap BOUNDED_N around return value. (chunk_realloc): Adjust oldsize once. * sysdeps/generic/bp-checks.h (__memchr): Remove incorrect decl. (__ubp_memchr): Add correct decl. (_CHECK_STRING): Use __ubp_memchr. * sysdeps/alpha/memchr.S [!__BOUNDED_POINTERS__] (__ubp_memchr): New alias for unbounded-pointer __memchr. * sysdeps/i386/memchr.S: Likewise. * sysdeps/ia64/memchr.S: Likewise. * sysdeps/m68k/memchr.S: Likewise. * sysdeps/sparc/sparc32/memchr.S: Likewise. * sysdeps/sparc/sparc64/memchr.S: Likewise. * sysdeps/vax/memchr.s: Likewise. * sysdeps/i386/strtok.S: Fix bounds checks to pass tests. (SAVE_PTR): New macro. (save_ptr): Expand size as BP. (strtok): Don't bother to write into SAVE_PTR when returning NULL. * sysdeps/i386/i686/strtok.S: Likewise. * sysdeps/i386/bp-asm.h (RETURN_BOUNDED_POINTER, RETURN_NULL_BOUNDED_POINTER): Use %ecx as the scratch register. * sysdeps/i386/bits/string.h [!__BOUNDED_POINTERS__]: Disable inlines. * sysdeps/i386/i486/bits/string.h [!__BOUNDED_POINTERS__]: Likewise. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Copy bounds of copy_result to mount_proc.
123 lines
4.5 KiB
C
123 lines
4.5 KiB
C
/* Bounded-pointer checking macros for C.
|
|
Copyright (C) 2000 Free Software Foundation, Inc.
|
|
Contributed by Greg McGary <greg@mcgary.org>
|
|
|
|
This file is part of the GNU C Library. Its master source is NOT part of
|
|
the C library, however. The master source lives in the GNU MP Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#ifndef _bp_checks_h_
|
|
#define _bp_checks_h_ 1
|
|
|
|
#if __BOUNDED_POINTERS__
|
|
|
|
# define BOUNDS_VIOLATED (__builtin_trap (), 0)
|
|
|
|
/* Verify that pointer's value >= low. Return pointer value. */
|
|
# define CHECK_BOUNDS_LOW(ARG) \
|
|
(((__ptrvalue (ARG) < __ptrlow (ARG)) && BOUNDS_VIOLATED), \
|
|
__ptrvalue (ARG))
|
|
|
|
/* Verify that pointer's value < high. Return pointer value. */
|
|
# define CHECK_BOUNDS_HIGH(ARG) \
|
|
(((__ptrvalue (ARG) > __ptrhigh (ARG)) && BOUNDS_VIOLATED), \
|
|
__ptrvalue (ARG))
|
|
|
|
# define _CHECK_N(ARG, N, COND) \
|
|
(((COND) \
|
|
&& (__ptrvalue (ARG) < __ptrlow (ARG) \
|
|
|| __ptrvalue (ARG) + (N) > __ptrhigh (ARG)) \
|
|
&& BOUNDS_VIOLATED), \
|
|
__ptrvalue (ARG))
|
|
|
|
extern void *__unbounded __ubp_memchr (const void *__unbounded, int, unsigned);
|
|
|
|
# define _CHECK_STRING(ARG, COND) \
|
|
(((COND) \
|
|
&& (__ptrvalue (ARG) < __ptrlow (ARG) \
|
|
|| !__ubp_memchr (__ptrvalue (ARG), '\0', \
|
|
(__ptrhigh (ARG) - __ptrvalue (ARG)))) \
|
|
&& BOUNDS_VIOLATED), \
|
|
__ptrvalue (ARG))
|
|
|
|
/* Check bounds of a pointer seated to an array of N objects. */
|
|
# define CHECK_N(ARG, N) _CHECK_N ((ARG), (N), 1)
|
|
/* Same as CHECK_N, but tolerate ARG == NULL. */
|
|
# define CHECK_Nopt(ARG, N) _CHECK_N ((ARG), (N), __ptrvalue (ARG))
|
|
|
|
/* Check bounds of a pointer seated to a single object. */
|
|
# define CHECK_1(ARG) CHECK_N ((ARG), 1)
|
|
/* Same as CHECK_1, but tolerate ARG == NULL. */
|
|
# define CHECK_1opt(ARG) CHECK_Nopt ((ARG), 1)
|
|
|
|
/* Check for NUL-terminator within string's bounds. */
|
|
# define CHECK_STRING(ARG) _CHECK_STRING ((ARG), 1)
|
|
/* Same as CHECK_STRING, but tolerate ARG == NULL. */
|
|
# define CHECK_STRINGopt(ARG) _CHECK_STRING ((ARG), __ptrvalue (ARG))
|
|
|
|
/* Check bounds of signal syscall args with type sigset_t. */
|
|
# define CHECK_SIGSET(SET) CHECK_N ((SET), _NSIG / (8 * sizeof *(SET)))
|
|
/* Same as CHECK_SIGSET, but tolerate SET == NULL. */
|
|
# define CHECK_SIGSETopt(SET) CHECK_Nopt ((SET), _NSIG / (8 * sizeof *(SET)))
|
|
|
|
# if defined (_IOC_SIZESHIFT) && defined (_IOC_SIZEBITS)
|
|
/* Extract the size of the ioctl data and check its bounds. */
|
|
# define CHECK_IOCTL(ARG, CMD) \
|
|
CHECK_N ((const char *) (ARG), \
|
|
(((CMD) >> _IOC_SIZESHIFT) & ((1 << _IOC_SIZEBITS) - 1)))
|
|
# else
|
|
/* We don't know the size of the ioctl data, so the best we can do
|
|
is check that the first byte is within bounds. */
|
|
# define CHECK_IOCTL(ARG, CMD) CHECK_1 ((const char *) ARG)
|
|
# endif
|
|
|
|
/* Check bounds of `struct flock *' for the locking fcntl commands. */
|
|
# define CHECK_FCNTL(ARG, CMD) \
|
|
(((CMD) == F_GETLK || (CMD) == F_SETLK || (CMD) == F_SETLKW) \
|
|
? CHECK_1 ((struct flock *) ARG) : (unsigned long) (ARG))
|
|
|
|
/* Return a bounded pointer with value PTR that satisfies CHECK_N (PTR, N). */
|
|
# define BOUNDED_N(PTR, N) \
|
|
({ __typeof (*(PTR)) *__bounded _p_; \
|
|
__ptrvalue _p_ = __ptrlow _p_ = __ptrvalue (PTR); \
|
|
__ptrhigh _p_ = __ptrvalue _p_ + (N); \
|
|
_p_; })
|
|
|
|
#else /* !__BOUNDED_POINTERS__ */
|
|
|
|
/* Do nothing if not compiling with -fbounded-pointers. */
|
|
|
|
# define BOUNDS_VIOLATED
|
|
# define CHECK_BOUNDS_LOW(ARG) (ARG)
|
|
# define CHECK_BOUNDS_HIGH(ARG) (ARG)
|
|
# define CHECK_1(ARG) (ARG)
|
|
# define CHECK_1opt(ARG) (ARG)
|
|
# define CHECK_N(ARG, N) (ARG)
|
|
# define CHECK_Nopt(ARG, N) (ARG)
|
|
# define CHECK_STRING(ARG) (ARG)
|
|
# define CHECK_SIGSET(SET) (SET)
|
|
# define CHECK_SIGSETopt(SET) (SET)
|
|
# define CHECK_IOCTL(ARG, CMD) (ARG)
|
|
# define CHECK_FCNTL(ARG, CMD) (ARG)
|
|
# define BOUNDED_N(PTR, N) (PTR)
|
|
|
|
#endif /* !__BOUNDED_POINTERS__ */
|
|
|
|
#define BOUNDED_1(PTR) BOUNDED_N (PTR, 1)
|
|
|
|
#endif /* _bp_checks_h_ */
|