diff options
| author | Greg McGary <greg@mcgary.org> | 2000-07-26 18:21:25 +0000 |
|---|---|---|
| committer | Greg McGary <greg@mcgary.org> | 2000-07-26 18:21:25 +0000 |
| commit | 2ed5fd9a2ab9b9b82f7095116d8f8434b73383cc (patch) | |
| tree | ac727a020d668748761bbcf5f7ce92e4c818b0b3 /sysdeps/generic | |
| parent | ac556388135e5bf0578cb24bc958870ff3a0f00c (diff) | |
| download | glibc-2ed5fd9a2ab9b9b82f7095116d8f8434b73383cc.tar.gz glibc-2ed5fd9a2ab9b9b82f7095116d8f8434b73383cc.tar.xz glibc-2ed5fd9a2ab9b9b82f7095116d8f8434b73383cc.zip | |
update
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.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/bp-checks.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/generic/bp-checks.h b/sysdeps/generic/bp-checks.h index 349bd81792..0da4657ae2 100644 --- a/sysdeps/generic/bp-checks.h +++ b/sysdeps/generic/bp-checks.h @@ -26,7 +26,6 @@ #if __BOUNDED_POINTERS__ # define BOUNDS_VIOLATED (__builtin_trap (), 0) -extern int __memchr (const char *__unbounded, int, unsigned); /* Verify that pointer's value >= low. Return pointer value. */ # define CHECK_BOUNDS_LOW(ARG) \ @@ -45,10 +44,12 @@ extern int __memchr (const char *__unbounded, int, unsigned); && BOUNDS_VIOLATED), \ __ptrvalue (ARG)) +extern void *__unbounded __ubp_memchr (const void *__unbounded, int, unsigned); + # define _CHECK_STRING(ARG, COND) \ (((COND) \ && (__ptrvalue (ARG) < __ptrlow (ARG) \ - || !__memchr (__ptrvalue (ARG), '\0', \ + || !__ubp_memchr (__ptrvalue (ARG), '\0', \ (__ptrhigh (ARG) - __ptrvalue (ARG)))) \ && BOUNDS_VIOLATED), \ __ptrvalue (ARG)) |