commit 62e59646f8795afac2eb4189a153e7decde370e7
author Elliott Hughes <enh@google.com> Tue Mar 01 11:22:42 2016 -0800
committer Elliott Hughes <enh@google.com> Tue Mar 01 12:46:47 2016 -0800
tree 263b028a69cf045c2a3938a737d38399ff4e1a7a
parent 2de7983470a04e3037a8993553c3b9533b985952

Improve diagnostics from the assembler __memset_chk routines.

Change-Id: Ic165043ab8cd5e16866b3e11cfba960514cbdc57

libc/arch-arm/krait/bionic/memset.S

diff --git a/libc/arch-arm/krait/bionic/memset.S b/libc/arch-arm/krait/bionic/memset.S
index 6b6d29c..0264dd3 100644
--- a/libc/arch-arm/krait/bionic/memset.S
+++ b/libc/arch-arm/krait/bionic/memset.S
@@ -47,12 +47,7 @@
         .cfi_def_cfa_offset 4
         .cfi_rel_offset lr, 0
 
-        ldr         r0, error_message
-1:
-        add         r0, pc
-        bl          __fortify_fatal
-error_message:
-        .word       error_string-(1b+8)
+        bl          __memset_chk_fail
 END(__memset_chk)
 
 ENTRY(bzero)
@@ -97,7 +92,3 @@
         strbcs      r1, [r3], #1
         bx          lr
 END(memset)
-
-        .data
-error_string:
-        .string     "memset: prevented write past end of buffer"