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

FORTIFY_SOURCE: emphasize prevention in error messages.

Browse Source 
FORTIFY_SOURCE prevents buffer overflows from occurring.
However, the error message often implies that we only
detect it, not prevent it.

Bring more clarity to the error messages by emphasizing
prevention over detection.

Change-Id: I5f3e1478673bdfc589e6cc4199fce8e52e197a24
This commit is contained in:
Nick Kralevich
2013-10-04 08:57:17 -07:00
parent 41ba05e22e
commit e2617290fc
16 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libc/bionic/__strncpy_chk.cpp
View File

@@ -45,7 +45,7 @@ extern "C" char* __strncpy_chk(char* __restrict dest, const char* __restrict src
size_t len, size_t dest_len)
{
if (__predict_false(len > dest_len)) {
__fortify_chk_fail("strncpy dest buffer overflow",
__fortify_chk_fail("strncpy dest buffer overflow prevented",
BIONIC_EVENT_STRNCPY_BUFFER_OVERFLOW);
}
@@ -64,7 +64,7 @@ extern "C" char* __strncpy_chk2(char* __restrict dst, const char* __restrict src
size_t n, size_t dest_len, size_t src_len)
{
if (__predict_false(n > dest_len)) {
__fortify_chk_fail("strncpy dest buffer overflow",
__fortify_chk_fail("strncpy dest buffer overflow prevented",
BIONIC_EVENT_STRNCPY_BUFFER_OVERFLOW);
}
if (n != 0) {
@@ -83,7 +83,7 @@ extern "C" char* __strncpy_chk2(char* __restrict dst, const char* __restrict src
size_t s_copy_len = static_cast<size_t>(s - src);
if (__predict_false(s_copy_len > src_len)) {
__fortify_chk_fail("strncpy read beyond end of src buffer", 0);
__fortify_chk_fail("strncpy buffer overrun prevented", 0);
}
}