generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "'Avoid confusing "read prevented write" log messages' 2."

Browse Source
This commit is contained in:
Elliott Hughes 2013-10-16 00:31:19 +00:00 committed by Gerrit Code Review
commit c100a10069
16 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-arm/cortex-a15/bionic/__strcat_chk.S
View File

@ -224,4 +224,4 @@ END(__strcat_chk_failed)
.data .data
error_string: error_string:
.string "strcat prevented write past end of buffer" .string "strcat: prevented write past end of buffer"

2
libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S
View File

@ -185,4 +185,4 @@ END(__strcpy_chk_failed)
.data .data
error_string: error_string:
.string "strcpy prevented write past end of buffer" .string "strcpy: prevented write past end of buffer"

2
libc/arch-arm/cortex-a15/bionic/memcpy.S
View File

@ -109,4 +109,4 @@ END(__memcpy_chk_fail)
.data .data
error_string: error_string:
.string "memcpy prevented write past end of buffer" .string "memcpy: prevented write past end of buffer"

2
libc/arch-arm/cortex-a15/bionic/memset.S
View File

@ -197,4 +197,4 @@ END(memset)
.data .data
error_string: error_string:
.string "memset prevented write past end of buffer" .string "memset: prevented write past end of buffer"

2
libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
View File

@ -227,4 +227,4 @@ END(__strcat_chk_fail)
.data .data
error_string: error_string:
.string "strcat prevented write past end of buffer" .string "strcat: prevented write past end of buffer"

2
libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
View File

@ -191,4 +191,4 @@ END(__strcpy_chk_fail)
.data .data
error_string: error_string:
.string "strcpy prevented write past end of buffer" .string "strcpy: prevented write past end of buffer"

2
libc/arch-arm/cortex-a9/bionic/memcpy.S
View File

@ -89,4 +89,4 @@ END(__memcpy_chk_fail)
.data .data
error_string: error_string:
.string "memcpy prevented write past end of buffer" .string "memcpy: prevented write past end of buffer"

2
libc/arch-arm/cortex-a9/bionic/memset.S
View File

@ -201,4 +201,4 @@ END(__memset_large_copy)
.data .data
error_string: error_string:
.string "memset prevented write past end of buffer" .string "memset: prevented write past end of buffer"

2
libc/arch-arm/generic/bionic/memcpy.S
View File

@ -401,4 +401,4 @@ END(memcpy)
.data .data
error_string: error_string:
.string "memcpy prevented write past end of buffer" .string "memcpy: prevented write past end of buffer"

2
libc/arch-arm/generic/bionic/memset.S
View File

@ -130,4 +130,4 @@ END(memset)
.data .data
error_string: error_string:
.string "memset prevented write past end of buffer" .string "memset: prevented write past end of buffer"

2
libc/arch-arm/krait/bionic/__strcat_chk.S
View File

@ -222,4 +222,4 @@ END(__strcat_chk_failed)
.data .data
error_string: error_string:
.string "strcat prevented write past end of buffer" .string "strcat: prevented write past end of buffer"

2
libc/arch-arm/krait/bionic/__strcpy_chk.S
View File

@ -184,4 +184,4 @@ END(__strcpy_chk_failed)
.data .data
error_string: error_string:
.string "strcpy prevented write past end of buffer" .string "strcpy: prevented write past end of buffer"

2
libc/arch-arm/krait/bionic/memcpy.S
View File

@ -89,4 +89,4 @@ END(__memcpy_chk_fail)
.data .data
error_string: error_string:
.string "memcpy prevented write past end of buffer" .string "memcpy: prevented write past end of buffer"

2
libc/arch-arm/krait/bionic/memset.S
View File

@ -116,4 +116,4 @@ END(memset)
.data .data
error_string: error_string:
.string "memset prevented write past end of buffer" .string "memset: prevented write past end of buffer"

2
libc/bionic/__vsnprintf_chk.cpp
View File

@ -63,7 +63,7 @@ extern "C" int __vsnprintf_chk(char* dest, size_t supplied_size, int /*flags*/,
* greater than 0. * greater than 0.
*/ */
extern "C" int __snprintf_chk(char* dest, size_t supplied_size, int flags, extern "C" int __snprintf_chk(char* dest, size_t supplied_size, int flags,
size_t dest_len_from_compiler, const char* format, ...) { size_t dest_len_from_compiler, const char* format, ...) {
va_list va; va_list va;
va_start(va, format); va_start(va, format);
int result = __vsnprintf_chk(dest, supplied_size, flags, dest_len_from_compiler, format, va); int result = __vsnprintf_chk(dest, supplied_size, flags, dest_len_from_compiler, format, va);

2
libc/bionic/__vsprintf_chk.cpp
View File

@ -43,7 +43,7 @@
* greater than 0. * greater than 0.
*/ */
extern "C" int __vsprintf_chk(char* dest, int /*flags*/, extern "C" int __vsprintf_chk(char* dest, int /*flags*/,
size_t dest_len_from_compiler, const char* format, va_list va) { size_t dest_len_from_compiler, const char* format, va_list va) {
int result = vsnprintf(dest, dest_len_from_compiler, format, va); int result = vsnprintf(dest, dest_len_from_compiler, format, va);
if ((size_t) result >= dest_len_from_compiler) { if ((size_t) result >= dest_len_from_compiler) {
__fortify_chk_fail("vsprintf: prevented write past end of buffer", 0); __fortify_chk_fail("vsprintf: prevented write past end of buffer", 0);