mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 05:20:06 +00:00
b5cc329c4f
* elf/dl-minimal.c (__chk_fail): New. Add rtld_hidden_def. * sysdeps/unix/sysv/linux/readonly-area.c: New file. * sysdeps/i386/i686/memmove.S (__memmove_chk): Add checking routine. * sysdeps/i386/i686/memcpy.S (__memcpy_chk): Likewise. * sysdeps/i386/i686/mempcpy.S (__mempcpy_chk): Likewise. * sysdeps/i386/i686/memset.S (__memset_chk): Likewise. * sysdeps/i386/i686/memmove-chk.S: New file. * sysdeps/i386/i686/memcpy-chk.S: Likewise. * sysdeps/i386/i686/mempcpy-chk.S: Likewise. * sysdeps/i386/i686/memset-chk.S: Likewise. * sysdeps/generic/strcat-chk.c (__strcat_chk): Don't __chk_fail if exactly fitting into buffer. * sysdeps/generic/strncat-chk.c (__strncat_chk): Likewise. * sysdeps/generic/readonly-area.c: New file. * sysdeps/generic/strncpy-chk.c (__strncpy_chk): Only test destlen once. * sysdeps/x86_64/memset.S (__memset_chk): Add checking routine. * sysdeps/x86_64/memcpy.S (__memcpy_chk): Likewise. * sysdeps/x86_64/mempcpy.S (__memcpy_chk): Define to __mempcpy_chk. * sysdeps/x86_64/memcpy-chk.S: New file. * sysdeps/x86_64/mempcpy-chk.S: Likewise. * sysdeps/x86_64/memset-chk.S: Likewise. * sysdeps/x86_64/strcpy-chk.S: Likewise. * sysdeps/x86_64/stpcpy-chk.S: Likewise. * argp/argp-xinl.c (__OPTIMIZE__): Define to 1 instead of nothing. * argp/argp-fs-xinl.c (__OPTIMIZE__): Likewise. * debug/tst-chk1.c: New test. * debug/tst-chk2.c: Likewise. * debug/tst-chk3.c: Likewise. * debug/test-strcpy_chk.c: Likewise. * debug/test-stpcpy_chk.c: Likewise. * debug/vsprintf_chk.c (__vsprintf_chk): If flags > 0, request _IO_FLAGS2_CHECK_PERCENT_N. Add libc_hidden_def. * debug/Makefile (routines): Add printf_chk, fprintf_chk, vprintf_chk, vfprintf_chk, gets_chk and readonly-area. (CFLAGS-*_chk.c): Set. (tests): Add tst-chk1, tst-chk2, tst-chk3, test-strcpy_chk and test-stpcpy_chk. * debug/vprintf_chk.c: New file. * debug/printf_chk.c: Likewise. * debug/vfprintf_chk.c: Likewise. * debug/fprintf_chk.c: Likewise. * debug/gets_chk.c: Likewise. * debug/chk_fail.c (__chk_fail): Add libc_hidden_def. * debug/snprintf_chk.c (__snprintf_chk): Fix order of arguments passed to __vsnprintf_chk. * debug/Versions (libc): Export __printf_chk, __fprintf_chk, __vprintf_chk, __vfprintf_chk and __gets_chk @GLIBC_2.3.4. * debug/vsnprintf_chk.c (__vsnprintf_chk): Don't call __vsnprintf, instead create a temporary file with _IO_strn_jumps jumptable. If flags > 0, request _IO_FLAGS2_CHECK_PERCENT_N. Add libc_hidden_def. * libio/Makefile (headers): Add bits/stdio2.h. * libio/stdio.h: Include <bits/stdio2.h> if __USE_FORTIFY_LEVEL. (sprintf, snprintf, vsprintf, vsnprintf): Remove defines. * libio/strfile.h (_IO_strnfile): New type. (_IO_strn_jumps): New extern. * libio/vsnprintf.c (_IO_strnfile): Remove. (_IO_strn_jumps): Remove static. * libio/bits/stdio2.h: New file. * libio/vswprintf.c (_IO_strnfile): Rename type to... (_IO_wstrnfile): ...this. Adjust all uses. * libio/libio.h (_IO_FLAGS2_CHECK_PERCENT_N): Define. * stdio-common/vfprintf.c (STR_LEN): Define. (vfprintf): Add readonly_format variable. Handle _IO_FLAGS2_CHECK_PERCENT_N. (buffered_vfprintf): Copy _flags2. * include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk, __vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk, __vfprintf_chk): New prototypes. (__vsprintf_chk, __vsnprintf_chk): Add libc_hidden_proto. * include/string.h (__memcpy_chk, __memmove_chk, __mempcpy_chk, __memset_chk, __strcpy_chk, __stpcpy_chk, __strncpy_chk, __strcat_chk, __strncat_chk): New prototypes. * include/bits/string3.h: New file. * include/sys/cdefs.h (__chk_fail): Add libc_hidden_proto and rtld_hidden_proto. * string/Makefile (headers): Add bits/string3.h. * string/bits/string3.h (bcopy, bzero): New defines. (memset, memcpy, memmove, strcpy, strncpy, strcat, strncat): Change macros so that inlines are used only if unknown destination size or side-effects in destination argument. (mempcpy, stpcpy): Likewise. Protect with #ifdef __USE_GNU. 2004-09-16 Ulrich Drepper <drepper@redhat.com> * debug/Makefile (routines): Add *_chk. * debug/Versions (libc): Export __chk_fail, __memcpy_chk, __memmove_chk, __mempcpy_chk, __memset_chk, __stpcpy_chk, __strcat_chk, __strcpy_chk, __strncat_chk, __strncpy_chk, __sprintf_chk, __vsprintf_chk, __snprintf_chk, __vsnprintf_chk @GLIBC_2.3.4. * debug/chk_fail.c: New file. * debug/snprintf_chk.c: Likewise. * debug/sprintf_chk.c: Likewise. * debug/vsnprintf_chk.c: Likewise. * debug/vsprintf_chk.c: Likewise. * include/features.h (_FORTIFY_SOURCE): Document, handle. (__USE_FORTIFY_LEVEL): Define. (__GNUC_PREREQ): Move to earlier location. * include/sys/cdefs.h (__chk_fail): New prototype. * libio/bits/stdio.h (sprintf, vsprintf, snprintf, vsnprintf): Define if __USE_FORTIFY_LEVEL. * misc/sys/cdefs.h (__bos, __bos0): Define. * string/string.h: Include <bits/string3.h> if __USE_FORTIFY_LEVEL. * bits/string/string3.h: New header. * sysdeps/generic/memcpy_chk.c: New file. * sysdeps/generic/memmove_chk.c: Likewise. * sysdeps/generic/mempcpy_chk.c: Likewise. * sysdeps/generic/memset_chk.c: Likewise. * sysdeps/generic/stpcpy_chk.c: Likewise. * sysdeps/generic/strcat_chk.c: Likewise. * sysdeps/generic/strcpy_chk.c: Likewise. * sysdeps/generic/strncat_chk.c: Likewise. * sysdeps/generic/strncpy_chk.c: Likewise. 2004-10-15 Jakub Jelinek <jakub@redhat.com> * elf/dl-minimal.c (__chk_fail): New. Add rtld_hidden_def. * sysdeps/unix/sysv/linux/readonly-area.c: New file. * sysdeps/i386/i686/memmove.S (__memmove_chk): Add checking routine. * sysdeps/i386/i686/memcpy.S (__memcpy_chk): Likewise. * sysdeps/i386/i686/mempcpy.S (__mempcpy_chk): Likewise. * sysdeps/i386/i686/memset.S (__memset_chk): Likewise. * sysdeps/i386/i686/memmove-chk.S: New file. * sysdeps/i386/i686/memcpy-chk.S: Likewise. * sysdeps/i386/i686/mempcpy-chk.S: Likewise. * sysdeps/i386/i686/memset-chk.S: Likewise. * sysdeps/generic/strcat-chk.c (__strcat_chk): Don't __chk_fail if exactly fitting into buffer. * sysdeps/generic/strncat-chk.c (__strncat_chk): Likewise. * sysdeps/generic/readonly-area.c: New file. * sysdeps/generic/strncpy-chk.c (__strncpy_chk): Only test destlen once. * sysdeps/x86_64/memset.S (__memset_chk): Add checking routine. * sysdeps/x86_64/memcpy.S (__memcpy_chk): Likewise. * sysdeps/x86_64/mempcpy.S (__memcpy_chk): Define to __mempcpy_chk. * sysdeps/x86_64/memcpy-chk.S: New file. * sysdeps/x86_64/mempcpy-chk.S: Likewise. * sysdeps/x86_64/memset-chk.S: Likewise. * sysdeps/x86_64/strcpy-chk.S: Likewise. * sysdeps/x86_64/stpcpy-chk.S: Likewise. * argp/argp-xinl.c (__OPTIMIZE__): Define to 1 instead of nothing. * argp/argp-fs-xinl.c (__OPTIMIZE__): Likewise. * debug/tst-chk1.c: New test. * debug/tst-chk2.c: Likewise. * debug/tst-chk3.c: Likewise. * debug/test-strcpy_chk.c: Likewise. * debug/test-stpcpy_chk.c: Likewise. * debug/vsprintf_chk.c (__vsprintf_chk): If flags > 0, request _IO_FLAGS2_CHECK_PERCENT_N. Add libc_hidden_def. * debug/Makefile (routines): Add printf_chk, fprintf_chk, vprintf_chk, vfprintf_chk, gets_chk and readonly-area. (CFLAGS-*_chk.c): Set. (tests): Add tst-chk1, tst-chk2, tst-chk3, test-strcpy_chk and test-stpcpy_chk. * debug/vprintf_chk.c: New file. * debug/printf_chk.c: Likewise. * debug/vfprintf_chk.c: Likewise. * debug/fprintf_chk.c: Likewise. * debug/gets_chk.c: Likewise. * debug/chk_fail.c (__chk_fail): Add libc_hidden_def. * debug/snprintf_chk.c (__snprintf_chk): Fix order of arguments passed to __vsnprintf_chk. * debug/Versions (libc): Export __printf_chk, __fprintf_chk, __vprintf_chk, __vfprintf_chk and __gets_chk @GLIBC_2.3.4. * debug/vsnprintf_chk.c (__vsnprintf_chk): Don't call __vsnprintf, instead create a temporary file with _IO_strn_jumps jumptable. If flags > 0, request _IO_FLAGS2_CHECK_PERCENT_N. Add libc_hidden_def. * libio/Makefile (headers): Add bits/stdio2.h. * libio/stdio.h: Include <bits/stdio2.h> if __USE_FORTIFY_LEVEL. (sprintf, snprintf, vsprintf, vsnprintf): Remove defines. * libio/strfile.h (_IO_strnfile): New type. (_IO_strn_jumps): New extern. * libio/vsnprintf.c (_IO_strnfile): Remove. (_IO_strn_jumps): Remove static. * libio/bits/stdio2.h: New file. * libio/vswprintf.c (_IO_strnfile): Rename type to... (_IO_wstrnfile): ...this. Adjust all uses. * libio/libio.h (_IO_FLAGS2_CHECK_PERCENT_N): Define. * stdio-common/vfprintf.c (STR_LEN): Define. (vfprintf): Add readonly_format variable. Handle _IO_FLAGS2_CHECK_PERCENT_N. (buffered_vfprintf): Copy _flags2. * include/stdio.h (__sprintf_chk, __snprintf_chk, __vsprintf_chk, __vsnprintf_chk, __printf_chk, __fprintf_chk, __vprintf_chk, __vfprintf_chk): New prototypes. (__vsprintf_chk, __vsnprintf_chk): Add libc_hidden_proto. * include/string.h (__memcpy_chk, __memmove_chk, __mempcpy_chk, __memset_chk, __strcpy_chk, __stpcpy_chk, __strncpy_chk, __strcat_chk, __strncat_chk): New prototypes. * include/bits/string3.h: New file. * include/sys/cdefs.h (__chk_fail): Add libc_hidden_proto and rtld_hidden_proto. * string/Makefile (headers): Add bits/string3.h. * string/bits/string3.h (bcopy, bzero): New defines. (memset, memcpy, memmove, strcpy, strncpy, strcat, strncat): Change macros so that inlines are used only if unknown destination size or side-effects in destination argument. (mempcpy, stpcpy): Likewise. Protect with #ifdef __USE_GNU. 2004-09-16 Ulrich Drepper <drepper@redhat.com> * debug/Makefile (routines): Add *_chk. * debug/Versions (libc): Export __chk_fail, __memcpy_chk, __memmove_chk, __mempcpy_chk, __memset_chk, __stpcpy_chk, __strcat_chk, __strcpy_chk, __strncat_chk, __strncpy_chk, __sprintf_chk, __vsprintf_chk, __snprintf_chk, __vsnprintf_chk @GLIBC_2.3.4. * debug/chk_fail.c: New file. * debug/snprintf_chk.c: Likewise. * debug/sprintf_chk.c: Likewise. * debug/vsnprintf_chk.c: Likewise. * debug/vsprintf_chk.c: Likewise. * include/features.h (_FORTIFY_SOURCE): Document, handle. (__USE_FORTIFY_LEVEL): Define. (__GNUC_PREREQ): Move to earlier location. * include/sys/cdefs.h (__chk_fail): New prototype. * libio/bits/stdio.h (sprintf, vsprintf, snprintf, vsnprintf): Define if __USE_FORTIFY_LEVEL. * misc/sys/cdefs.h (__bos, __bos0): Define. * string/string.h: Include <bits/string3.h> if __USE_FORTIFY_LEVEL. * bits/string/string3.h: New header. * sysdeps/generic/memcpy_chk.c: New file. * sysdeps/generic/memmove_chk.c: Likewise. * sysdeps/generic/mempcpy_chk.c: Likewise. * sysdeps/generic/memset_chk.c: Likewise. * sysdeps/generic/stpcpy_chk.c: Likewise. * sysdeps/generic/strcat_chk.c: Likewise. * sysdeps/generic/strcpy_chk.c: Likewise. * sysdeps/generic/strncat_chk.c: Likewise. * sysdeps/generic/strncpy_chk.c: Likewise.
212 lines
6.9 KiB
ArmAsm
212 lines
6.9 KiB
ArmAsm
/* strcpy/stpcpy checking implementation for x86-64.
|
|
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Andreas Jaeger <aj@suse.de>, 2002.
|
|
Adopted into checking version by Jakub Jelinek <jakub@redhat.com>.
|
|
|
|
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. */
|
|
|
|
#include <sysdep.h>
|
|
#include "asm-syntax.h"
|
|
#include "bp-sym.h"
|
|
#include "bp-asm.h"
|
|
|
|
#ifndef USE_AS_STPCPY_CHK
|
|
# define STRCPY_CHK __strcpy_chk
|
|
#endif
|
|
|
|
.text
|
|
ENTRY (STRCPY_CHK)
|
|
movq %rsi, %rcx /* Source register. */
|
|
andl $7, %ecx /* mask alignment bits */
|
|
#ifndef USE_AS_STPCPY_CHK
|
|
movq %rdi, %r10 /* Duplicate destination pointer. */
|
|
#endif
|
|
jz 5f /* aligned => start loop */
|
|
|
|
cmpq $8, %rdx /* Check if only few bytes left in
|
|
destination. */
|
|
jb 50f
|
|
|
|
subq $8, %rcx /* We need to align to 8 bytes. */
|
|
addq %rcx, %rdx /* Subtract count of stored bytes
|
|
in the cycle below from destlen. */
|
|
|
|
/* Search the first bytes directly. */
|
|
0:
|
|
movb (%rsi), %al /* Fetch a byte */
|
|
testb %al, %al /* Is it NUL? */
|
|
movb %al, (%rdi) /* Store it */
|
|
jz 4f /* If it was NUL, done! */
|
|
incq %rsi
|
|
incq %rdi
|
|
incl %ecx
|
|
jnz 0b
|
|
|
|
5:
|
|
movq $0xfefefefefefefeff,%r8
|
|
cmpq $32, %rdx /* Are there enough bytes in destination
|
|
for the next unrolled round? */
|
|
jb 60f /* If not, avoid the unrolled loop. */
|
|
|
|
/* Now the sources is aligned. Unfortunatly we cannot force
|
|
to have both source and destination aligned, so ignore the
|
|
alignment of the destination. */
|
|
.p2align 4
|
|
1:
|
|
/* 1st unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
movq %rax, (%rdi) /* Write value to destination. */
|
|
addq $8, %rdi /* Adjust pointer. */
|
|
|
|
/* 2nd unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
movq %rax, (%rdi) /* Write value to destination. */
|
|
addq $8, %rdi /* Adjust pointer. */
|
|
|
|
/* 3rd unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
movq %rax, (%rdi) /* Write value to destination. */
|
|
addq $8, %rdi /* Adjust pointer. */
|
|
|
|
/* 4th unroll. */
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
subq $32, %rdx /* Adjust destlen. */
|
|
movq %rax, (%rdi) /* Write value to destination. */
|
|
addq $8, %rdi /* Adjust pointer. */
|
|
cmpq $32, %rdx /* Are there enough bytes in destination
|
|
for the next unrolled round? */
|
|
jae 1b /* Next iteration. */
|
|
|
|
60:
|
|
cmpq $8, %rdx /* Are there enough bytes in destination
|
|
for the next unrolled round? */
|
|
jb 50f /* Now, copy and check byte by byte. */
|
|
|
|
movq (%rsi), %rax /* Read double word (8 bytes). */
|
|
addq $8, %rsi /* Adjust pointer for next word. */
|
|
movq %rax, %r9 /* Save a copy for NUL finding. */
|
|
addq %r8, %r9 /* add the magic value to the word. We get
|
|
carry bits reported for each byte which
|
|
is *not* 0 */
|
|
jnc 3f /* highest byte is NUL => return pointer */
|
|
xorq %rax, %r9 /* (word+magic)^word */
|
|
orq %r8, %r9 /* set all non-carry bits */
|
|
incq %r9 /* add 1: if one carry bit was *not* set
|
|
the addition will not result in 0. */
|
|
|
|
jnz 3f /* found NUL => return pointer */
|
|
|
|
subq $8, %rdx /* Adjust destlen. */
|
|
movq %rax, (%rdi) /* Write value to destination. */
|
|
addq $8, %rdi /* Adjust pointer. */
|
|
jmp 60b /* Next iteration. */
|
|
|
|
/* Do the last few bytes. %rax contains the value to write.
|
|
The loop is unrolled twice. */
|
|
.p2align 4
|
|
3:
|
|
/* Note that stpcpy needs to return with the value of the NUL
|
|
byte. */
|
|
movb %al, (%rdi) /* 1st byte. */
|
|
testb %al, %al /* Is it NUL. */
|
|
jz 4f /* yes, finish. */
|
|
incq %rdi /* Increment destination. */
|
|
movb %ah, (%rdi) /* 2nd byte. */
|
|
testb %ah, %ah /* Is it NUL?. */
|
|
jz 4f /* yes, finish. */
|
|
incq %rdi /* Increment destination. */
|
|
shrq $16, %rax /* Shift... */
|
|
jmp 3b /* and look at next two bytes in %rax. */
|
|
|
|
51:
|
|
/* Search the bytes directly, checking for overflows. */
|
|
incq %rsi
|
|
incq %rdi
|
|
decq %rdx
|
|
jz HIDDEN_JUMPTARGET (__chk_fail)
|
|
52:
|
|
movb (%rsi), %al /* Fetch a byte */
|
|
testb %al, %al /* Is it NUL? */
|
|
movb %al, (%rdi) /* Store it */
|
|
jnz 51b /* If it was NUL, done! */
|
|
4:
|
|
#ifdef USE_AS_STPCPY_CHK
|
|
movq %rdi, %rax /* Destination is return value. */
|
|
#else
|
|
movq %r10, %rax /* Source is return value. */
|
|
#endif
|
|
retq
|
|
|
|
50:
|
|
testq %rdx, %rdx
|
|
jnz 52b
|
|
jmp HIDDEN_JUMPTARGET (__chk_fail)
|
|
|
|
END (STRCPY_CHK)
|