Improve FORTIFY failure diagnostics.
Our FORTIFY _chk functions' implementations were very repetitive and verbose
but not very helpful. We'd also screwed up and put the SSIZE_MAX checks where
they would never fire unless you actually had a buffer as large as half your
address space, which probably doesn't happen very often.
Factor out the duplication and take the opportunity to actually show details
like how big the overrun buffer was, or by how much it was overrun.
Also remove the obsolete FORTIFY event logging.
Also remove the unused __libc_fatal_no_abort.
This change doesn't improve the diagnostics from the optimized assembler
implementations.
Change-Id: I176a90701395404d50975b547a00bd2c654e1252
diff --git a/libc/arch-arm/cortex-a15/bionic/__strcat_chk_common.S b/libc/arch-arm/cortex-a15/bionic/__strcat_chk_common.S
index de66967..020ce42 100644
--- a/libc/arch-arm/cortex-a15/bionic/__strcat_chk_common.S
+++ b/libc/arch-arm/cortex-a15/bionic/__strcat_chk_common.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
@@ -197,12 +196,9 @@
.cfi_rel_offset r5, 4
.L_strcat_chk_failed:
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_STRCAT_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__strcat_chk)
diff --git a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk_common.S b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk_common.S
index 69ebcb4..215e6c2 100644
--- a/libc/arch-arm/cortex-a15/bionic/__strcpy_chk_common.S
+++ b/libc/arch-arm/cortex-a15/bionic/__strcpy_chk_common.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
@@ -158,12 +157,9 @@
.L_strcpy_chk_failed:
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_STRCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__strcpy_chk)
diff --git a/libc/arch-arm/cortex-a15/bionic/memcpy_common.S b/libc/arch-arm/cortex-a15/bionic/memcpy_common.S
index 464fb46..955ffb8 100644
--- a/libc/arch-arm/cortex-a15/bionic/memcpy_common.S
+++ b/libc/arch-arm/cortex-a15/bionic/memcpy_common.S
@@ -54,7 +54,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.text
.syntax unified
@@ -88,12 +87,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(memcpy)
diff --git a/libc/arch-arm/cortex-a15/bionic/memset.S b/libc/arch-arm/cortex-a15/bionic/memset.S
index e4a1ec8..6941150 100644
--- a/libc/arch-arm/cortex-a15/bionic/memset.S
+++ b/libc/arch-arm/cortex-a15/bionic/memset.S
@@ -28,7 +28,6 @@
#include <machine/cpu-features.h>
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* Optimized memset() for ARM.
@@ -49,12 +48,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMSET_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(__memset_chk)
diff --git a/libc/arch-arm/cortex-a7/bionic/memset.S b/libc/arch-arm/cortex-a7/bionic/memset.S
index 6365b06..8e69bbc 100644
--- a/libc/arch-arm/cortex-a7/bionic/memset.S
+++ b/libc/arch-arm/cortex-a7/bionic/memset.S
@@ -28,7 +28,6 @@
#include <machine/cpu-features.h>
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* Optimized memset() for ARM.
@@ -49,12 +48,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMSET_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(__memset_chk)
diff --git a/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S b/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
index 45517f1..6245861 100644
--- a/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
+++ b/libc/arch-arm/cortex-a9/bionic/__strcat_chk.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
.fpu neon
@@ -205,12 +204,9 @@
.cfi_rel_offset r5, 4
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_STRCAT_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__strcat_chk_fail)
diff --git a/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S b/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
index 67eca08..14741b6 100644
--- a/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
+++ b/libc/arch-arm/cortex-a9/bionic/__strcpy_chk.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
.fpu neon
@@ -169,13 +168,10 @@
.cfi_rel_offset lr, 4
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
+ bl __fortify_fatal
-error_code:
- .word BIONIC_EVENT_STRCPY_BUFFER_OVERFLOW
error_message:
.word error_string-(1b+4)
END(__strcpy_chk_fail)
diff --git a/libc/arch-arm/cortex-a9/bionic/memcpy.S b/libc/arch-arm/cortex-a9/bionic/memcpy.S
index db3e26f..fc0bba1 100644
--- a/libc/arch-arm/cortex-a9/bionic/memcpy.S
+++ b/libc/arch-arm/cortex-a9/bionic/memcpy.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* This code assumes it is running on a processor that supports all arm v7
@@ -67,12 +66,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__memcpy_chk_fail)
diff --git a/libc/arch-arm/cortex-a9/bionic/memset.S b/libc/arch-arm/cortex-a9/bionic/memset.S
index b39fcc4..918a4ad 100644
--- a/libc/arch-arm/cortex-a9/bionic/memset.S
+++ b/libc/arch-arm/cortex-a9/bionic/memset.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* This code assumes it is running on a processor that supports all arm v7
@@ -47,12 +46,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMSET_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(__memset_chk)
diff --git a/libc/arch-arm/denver/bionic/__strcat_chk.S b/libc/arch-arm/denver/bionic/__strcat_chk.S
index a2e9c22..2fbf5d6 100644
--- a/libc/arch-arm/denver/bionic/__strcat_chk.S
+++ b/libc/arch-arm/denver/bionic/__strcat_chk.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
@@ -201,12 +200,9 @@
.cfi_rel_offset r5, 4
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_STRCAT_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__strcat_chk_failed)
diff --git a/libc/arch-arm/denver/bionic/__strcpy_chk.S b/libc/arch-arm/denver/bionic/__strcpy_chk.S
index db76686..36188b0 100644
--- a/libc/arch-arm/denver/bionic/__strcpy_chk.S
+++ b/libc/arch-arm/denver/bionic/__strcpy_chk.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
@@ -165,12 +164,9 @@
.cfi_rel_offset lr, 4
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_STRCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__strcpy_chk_failed)
diff --git a/libc/arch-arm/denver/bionic/memcpy.S b/libc/arch-arm/denver/bionic/memcpy.S
index 410b663..c1db06c 100644
--- a/libc/arch-arm/denver/bionic/memcpy.S
+++ b/libc/arch-arm/denver/bionic/memcpy.S
@@ -56,7 +56,6 @@
// Prototype: void *memcpy (void *dst, const void *src, size_t count).
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.text
.syntax unified
@@ -88,12 +87,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(__memcpy_chk_fail)
diff --git a/libc/arch-arm/denver/bionic/memmove.S b/libc/arch-arm/denver/bionic/memmove.S
index 132190b..94302f3 100644
--- a/libc/arch-arm/denver/bionic/memmove.S
+++ b/libc/arch-arm/denver/bionic/memmove.S
@@ -28,7 +28,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.text
.syntax unified
diff --git a/libc/arch-arm/denver/bionic/memset.S b/libc/arch-arm/denver/bionic/memset.S
index d77c244..6fac194 100644
--- a/libc/arch-arm/denver/bionic/memset.S
+++ b/libc/arch-arm/denver/bionic/memset.S
@@ -29,7 +29,6 @@
#include <machine/cpu-features.h>
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* Optimized memset() for ARM.
@@ -52,12 +51,9 @@
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMSET_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(__memset_chk)
diff --git a/libc/arch-arm/generic/bionic/memcpy.S b/libc/arch-arm/generic/bionic/memcpy.S
index 65cba4c..54c3060 100644
--- a/libc/arch-arm/generic/bionic/memcpy.S
+++ b/libc/arch-arm/generic/bionic/memcpy.S
@@ -28,7 +28,6 @@
#include <machine/cpu-features.h>
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* Optimized memcpy() for ARM.
@@ -395,12 +394,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(__memcpy_chk_fail)
diff --git a/libc/arch-arm/generic/bionic/memset.S b/libc/arch-arm/generic/bionic/memset.S
index b8eabbf..452b9d4 100644
--- a/libc/arch-arm/generic/bionic/memset.S
+++ b/libc/arch-arm/generic/bionic/memset.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* Optimized memset() for ARM.
@@ -42,12 +41,9 @@
bls done
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMSET_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
diff --git a/libc/arch-arm/krait/bionic/__strcat_chk.S b/libc/arch-arm/krait/bionic/__strcat_chk.S
index 1a39c5b..fabca24 100644
--- a/libc/arch-arm/krait/bionic/__strcat_chk.S
+++ b/libc/arch-arm/krait/bionic/__strcat_chk.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
@@ -197,12 +196,9 @@
.cfi_rel_offset r5, 4
.L_strcat_chk_failed:
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_STRCAT_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__strcat_chk)
diff --git a/libc/arch-arm/krait/bionic/__strcpy_chk.S b/libc/arch-arm/krait/bionic/__strcpy_chk.S
index 00202f3..ef908e6 100644
--- a/libc/arch-arm/krait/bionic/__strcpy_chk.S
+++ b/libc/arch-arm/krait/bionic/__strcpy_chk.S
@@ -27,7 +27,6 @@
*/
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
.syntax unified
@@ -158,12 +157,9 @@
.L_strcpy_chk_failed:
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_STRCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(__strcpy_chk)
diff --git a/libc/arch-arm/krait/bionic/memcpy.S b/libc/arch-arm/krait/bionic/memcpy.S
index 5d27b57..189a097 100644
--- a/libc/arch-arm/krait/bionic/memcpy.S
+++ b/libc/arch-arm/krait/bionic/memcpy.S
@@ -29,7 +29,6 @@
/* Assumes neon instructions and a cache line size of 32 bytes. */
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* This code assumes it is running on a processor that supports all arm v7
@@ -70,12 +69,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMCPY_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+4)
END(memcpy)
diff --git a/libc/arch-arm/krait/bionic/memset.S b/libc/arch-arm/krait/bionic/memset.S
index ae05965..6b6d29c 100644
--- a/libc/arch-arm/krait/bionic/memset.S
+++ b/libc/arch-arm/krait/bionic/memset.S
@@ -28,7 +28,6 @@
#include <machine/cpu-features.h>
#include <private/bionic_asm.h>
-#include <private/libc_events.h>
/*
* This code assumes it is running on a processor that supports all arm v7
@@ -49,12 +48,9 @@
.cfi_rel_offset lr, 0
ldr r0, error_message
- ldr r1, error_code
1:
add r0, pc
- bl __fortify_chk_fail
-error_code:
- .word BIONIC_EVENT_MEMSET_BUFFER_OVERFLOW
+ bl __fortify_fatal
error_message:
.word error_string-(1b+8)
END(__memset_chk)