pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable FORTIFY unit tests for clang 

And add a thing to remind us to enable the malloc FORTIFY test when we
pull a new clang in.

Bug: 34747525
Test: vts -m BionicUnitTests on bullhead
Change-Id: If341a27756d608a0fa77ba6518e9bcc725f7632c
This commit is contained in:
George Burgess IV 2017-04-06 11:26:11 -07:00
parent e06c69d073
commit 5f8a673a7f
1 changed files with 6 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
tests/fortify_test.cpp
View File

@ -58,71 +58,44 @@ struct foo {
char b[10];
};
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, stpncpy_fortified2) {
foo myfoo;
int copy_amt = atoi("11");
ASSERT_FORTIFY(stpncpy(myfoo.a, "01234567890", copy_amt));
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, stpncpy2_fortified2) {
foo myfoo;
memset(&myfoo, 0, sizeof(myfoo));
myfoo.one[0] = 'A'; // not null terminated string
ASSERT_FORTIFY(stpncpy(myfoo.b, myfoo.one, sizeof(myfoo.b)));
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strncpy_fortified2) {
foo myfoo;
int copy_amt = atoi("11");
ASSERT_FORTIFY(strncpy(myfoo.a, "01234567890", copy_amt));
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strncpy2_fortified2) {
foo myfoo;
memset(&myfoo, 0, sizeof(myfoo));
myfoo.one[0] = 'A'; // not null terminated string
ASSERT_FORTIFY(strncpy(myfoo.b, myfoo.one, sizeof(myfoo.b)));
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, sprintf_fortified2) {
foo myfoo;
char source_buf[15];
memcpy(source_buf, "12345678901234", 15);
ASSERT_FORTIFY(sprintf(myfoo.a, "%s", source_buf));
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, sprintf2_fortified2) {
foo myfoo;
ASSERT_FORTIFY(sprintf(myfoo.a, "0123456789"));
}
#endif
#ifndef __clang__
// These tests are disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
static int vsprintf_helper2(const char *fmt, ...) {
foo myfoo;
va_list va;
@ -141,11 +114,7 @@ TEST_F(DEATHTEST, vsprintf_fortified2) {
TEST_F(DEATHTEST, vsprintf2_fortified2) {
ASSERT_FORTIFY(vsprintf_helper2("0123456789"));
}
#endif
#ifndef __clang__
// These tests are disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
static int vsnprintf_helper2(const char *fmt, ...) {
foo myfoo;
va_list va;
@ -165,12 +134,8 @@ TEST_F(DEATHTEST, vsnprintf_fortified2) {
TEST_F(DEATHTEST, vsnprintf2_fortified2) {
ASSERT_FORTIFY(vsnprintf_helper2("0123456789"));
}
#endif
#ifndef __clang__
// zero sized target with "\0" source (should fail)
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, stpcpy_fortified2) {
#if defined(__BIONIC__)
foo myfoo;
@ -181,12 +146,8 @@ TEST_F(DEATHTEST, stpcpy_fortified2) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif // __BIONIC__
}
#endif
#ifndef __clang__
// zero sized target with "\0" source (should fail)
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strcpy_fortified2) {
#if defined(__BIONIC__)
foo myfoo;
@ -197,12 +158,8 @@ TEST_F(DEATHTEST, strcpy_fortified2) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif // __BIONIC__
}
#endif
#ifndef __clang__
// zero sized target with longer source (should fail)
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strcpy2_fortified2) {
#if defined(__BIONIC__)
foo myfoo;
@ -213,12 +170,8 @@ TEST_F(DEATHTEST, strcpy2_fortified2) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif // __BIONIC__
}
#endif
#ifndef __clang__
// one byte target with longer source (should fail)
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strcpy3_fortified2) {
#if defined(__BIONIC__)
foo myfoo;
@ -229,7 +182,6 @@ TEST_F(DEATHTEST, strcpy3_fortified2) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif // __BIONIC__
}
#endif
TEST_F(DEATHTEST, strchr_fortified2) {
#if defined(__BIONIC__)
@ -267,8 +219,6 @@ TEST_F(DEATHTEST, memchr_fortified2) {
#endif // __BIONIC__
}
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strlcpy_fortified2) {
#if defined(__BIONIC__)
@ -280,10 +230,7 @@ TEST_F(DEATHTEST, strlcpy_fortified2) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif // __BIONIC__
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strlcat_fortified2) {
#if defined(__BIONIC__)
@ -296,29 +243,20 @@ TEST_F(DEATHTEST, strlcat_fortified2) {
GTEST_LOG_(INFO) << "This test does nothing.\n";
#endif // __BIONIC__
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strncat_fortified2) {
foo myfoo;
size_t n = atoi("10"); // avoid compiler optimizations
strncpy(myfoo.a, "012345678", n);
ASSERT_FORTIFY(strncat(myfoo.a, "9", n));
}
#endif
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strncat2_fortified2) {
foo myfoo;
myfoo.a[0] = '\0';
size_t n = atoi("10"); // avoid compiler optimizations
ASSERT_FORTIFY(strncat(myfoo.a, "0123456789", n));
}
#endif
TEST_F(DEATHTEST, strncat3_fortified2) {
foo myfoo;
@ -328,9 +266,6 @@ TEST_F(DEATHTEST, strncat3_fortified2) {
ASSERT_FORTIFY(strncat(myfoo.b, myfoo.a, n));
}
#ifndef __clang__
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, strcat_fortified2) {
char src[11];
strcpy(src, "0123456789");
@ -338,7 +273,6 @@ TEST_F(DEATHTEST, strcat_fortified2) {
myfoo.a[0] = '\0';
ASSERT_FORTIFY(strcat(myfoo.a, src));
}
#endif
TEST_F(DEATHTEST, strcat2_fortified2) {
foo myfoo;
@ -473,7 +407,12 @@ TEST_F(DEATHTEST, sprintf_fortified) {
ASSERT_FORTIFY(sprintf(buf, "%s", source_buf));
}
#ifndef __clang__
#ifdef __clang__
// Exists upstream, but hasn't been pulled in yet.
#if __has_attribute(alloc_size)
#error "Reenable this test"
#endif
#else
// This test is disabled in clang because clang doesn't properly detect
// this buffer overflow. TODO: Fix clang.
TEST_F(DEATHTEST, sprintf_malloc_fortified) {