From 68b67113a44311b3568027af5893e316f63ec556 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 15 Oct 2013 17:17:05 -0700 Subject: [PATCH] 'Avoid confusing "read prevented write" log messages' 2. This time it's assembler. Change-Id: Iae6369833b8046b8eda70238bb4ed0cae64269ea --- libc/arch-arm/cortex-a15/bionic/__strcat_chk.S | 2 +- libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S | 2 +- libc/arch-arm/cortex-a15/bionic/memcpy.S | 2 +- libc/arch-arm/cortex-a15/bionic/memset.S | 2 +- libc/arch-arm/cortex-a9/bionic/__strcat_chk.S | 2 +- libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S | 2 +- libc/arch-arm/cortex-a9/bionic/memcpy.S | 2 +- libc/arch-arm/cortex-a9/bionic/memset.S | 2 +- libc/arch-arm/generic/bionic/memcpy.S | 2 +- libc/arch-arm/generic/bionic/memset.S | 2 +- libc/arch-arm/krait/bionic/__strcat_chk.S | 2 +- libc/arch-arm/krait/bionic/__strcpy_chk.S | 2 +- libc/arch-arm/krait/bionic/memcpy.S | 2 +- libc/arch-arm/krait/bionic/memset.S | 2 +- libc/bionic/__vsnprintf_chk.cpp | 2 +- libc/bionic/__vsprintf_chk.cpp | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S index 51f858e65..616da0104 100644 --- a/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S +++ b/libc/arch-arm/cortex-a15/bionic/__strcat_chk.S @@ -224,4 +224,4 @@ END(__strcat_chk_failed) .data error_string: - .string "strcat prevented write past end of buffer" + .string "strcat: prevented write past end of buffer" diff --git a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S index 782792ff9..929cc98df 100644 --- a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S +++ b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk.S @@ -185,4 +185,4 @@ END(__strcpy_chk_failed) .data error_string: - .string "strcpy prevented write past end of buffer" + .string "strcpy: prevented write past end of buffer" diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy.S b/libc/arch-arm/cortex-a15/bionic/memcpy.S index dae39c378..6f77ca628 100644 --- a/libc/arch-arm/cortex-a15/bionic/memcpy.S +++ b/libc/arch-arm/cortex-a15/bionic/memcpy.S @@ -109,4 +109,4 @@ END(__memcpy_chk_fail) .data error_string: - .string "memcpy prevented write past end of buffer" + .string "memcpy: prevented write past end of buffer" diff --git a/libc/arch-arm/cortex-a15/bionic/memset.S b/libc/arch-arm/cortex-a15/bionic/memset.S index 8775ee8f8..701310c1f 100644 --- a/libc/arch-arm/cortex-a15/bionic/memset.S +++ b/libc/arch-arm/cortex-a15/bionic/memset.S @@ -197,4 +197,4 @@ END(memset) .data error_string: - .string "memset prevented write past end of buffer" + .string "memset: prevented write past end of buffer" diff --git a/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S index d6ae0f369..23b4e9852 100644 --- a/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S +++ b/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S @@ -227,4 +227,4 @@ END(__strcat_chk_fail) .data error_string: - .string "strcat prevented write past end of buffer" + .string "strcat: prevented write past end of buffer" diff --git a/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S index 55926c1d8..adefdc39b 100644 --- a/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S +++ b/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S @@ -191,4 +191,4 @@ END(__strcpy_chk_fail) .data error_string: - .string "strcpy prevented write past end of buffer" + .string "strcpy: prevented write past end of buffer" diff --git a/libc/arch-arm/cortex-a9/bionic/memcpy.S b/libc/arch-arm/cortex-a9/bionic/memcpy.S index 8904534ea..6e0712f59 100644 --- a/libc/arch-arm/cortex-a9/bionic/memcpy.S +++ b/libc/arch-arm/cortex-a9/bionic/memcpy.S @@ -89,4 +89,4 @@ END(__memcpy_chk_fail) .data error_string: - .string "memcpy prevented write past end of buffer" + .string "memcpy: prevented write past end of buffer" diff --git a/libc/arch-arm/cortex-a9/bionic/memset.S b/libc/arch-arm/cortex-a9/bionic/memset.S index 6eb2b4a3e..e2a3f7503 100644 --- a/libc/arch-arm/cortex-a9/bionic/memset.S +++ b/libc/arch-arm/cortex-a9/bionic/memset.S @@ -201,4 +201,4 @@ END(__memset_large_copy) .data error_string: - .string "memset prevented write past end of buffer" + .string "memset: prevented write past end of buffer" diff --git a/libc/arch-arm/generic/bionic/memcpy.S b/libc/arch-arm/generic/bionic/memcpy.S index 5d55aae7c..87ebc44a0 100644 --- a/libc/arch-arm/generic/bionic/memcpy.S +++ b/libc/arch-arm/generic/bionic/memcpy.S @@ -401,4 +401,4 @@ END(memcpy) .data error_string: - .string "memcpy prevented write past end of buffer" + .string "memcpy: prevented write past end of buffer" diff --git a/libc/arch-arm/generic/bionic/memset.S b/libc/arch-arm/generic/bionic/memset.S index 435d83ced..baeb51966 100644 --- a/libc/arch-arm/generic/bionic/memset.S +++ b/libc/arch-arm/generic/bionic/memset.S @@ -130,4 +130,4 @@ END(memset) .data error_string: - .string "memset prevented write past end of buffer" + .string "memset: prevented write past end of buffer" diff --git a/libc/arch-arm/krait/bionic/__strcat_chk.S b/libc/arch-arm/krait/bionic/__strcat_chk.S index 71115403d..302478e41 100644 --- a/libc/arch-arm/krait/bionic/__strcat_chk.S +++ b/libc/arch-arm/krait/bionic/__strcat_chk.S @@ -222,4 +222,4 @@ END(__strcat_chk_failed) .data error_string: - .string "strcat prevented write past end of buffer" + .string "strcat: prevented write past end of buffer" diff --git a/libc/arch-arm/krait/bionic/__strcpy_chk.S b/libc/arch-arm/krait/bionic/__strcpy_chk.S index f02a32d81..a2c1df1c1 100644 --- a/libc/arch-arm/krait/bionic/__strcpy_chk.S +++ b/libc/arch-arm/krait/bionic/__strcpy_chk.S @@ -184,4 +184,4 @@ END(__strcpy_chk_failed) .data error_string: - .string "strcpy prevented write past end of buffer" + .string "strcpy: prevented write past end of buffer" diff --git a/libc/arch-arm/krait/bionic/memcpy.S b/libc/arch-arm/krait/bionic/memcpy.S index 44cc1447a..b3ce95de6 100644 --- a/libc/arch-arm/krait/bionic/memcpy.S +++ b/libc/arch-arm/krait/bionic/memcpy.S @@ -89,4 +89,4 @@ END(__memcpy_chk_fail) .data error_string: - .string "memcpy prevented write past end of buffer" + .string "memcpy: prevented write past end of buffer" diff --git a/libc/arch-arm/krait/bionic/memset.S b/libc/arch-arm/krait/bionic/memset.S index b5a9d78c4..c5a93862c 100644 --- a/libc/arch-arm/krait/bionic/memset.S +++ b/libc/arch-arm/krait/bionic/memset.S @@ -116,4 +116,4 @@ END(memset) .data error_string: - .string "memset prevented write past end of buffer" + .string "memset: prevented write past end of buffer" diff --git a/libc/bionic/__vsnprintf_chk.cpp b/libc/bionic/__vsnprintf_chk.cpp index ecf58168b..8550224b3 100644 --- a/libc/bionic/__vsnprintf_chk.cpp +++ b/libc/bionic/__vsnprintf_chk.cpp @@ -63,7 +63,7 @@ extern "C" int __vsnprintf_chk(char* dest, size_t supplied_size, int /*flags*/, * greater than 0. */ 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_start(va, format); int result = __vsnprintf_chk(dest, supplied_size, flags, dest_len_from_compiler, format, va); diff --git a/libc/bionic/__vsprintf_chk.cpp b/libc/bionic/__vsprintf_chk.cpp index feb6e6831..bd2aeaba5 100644 --- a/libc/bionic/__vsprintf_chk.cpp +++ b/libc/bionic/__vsprintf_chk.cpp @@ -43,7 +43,7 @@ * greater than 0. */ 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); if ((size_t) result >= dest_len_from_compiler) { __fortify_chk_fail("vsprintf: prevented write past end of buffer", 0);