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

fix unittests.

Browse Source 
7e6ce1a3c5 fixed abort() to raise
SIGABRT rather than causing SIGSEGV. However, the unittests were
not updated.

Fix unittests.

Change-Id: I73db194127b9b9e9440358aa94273863765a736b
This commit is contained in:
Nick Kralevich
2013-06-11 15:45:23 -07:00
parent fc104f899d
commit fd0325bd98
3 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/fortify1_test.cpp
View File

@@ -29,7 +29,7 @@ TEST(Fortify1_DeathTest, strcpy_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
char *orig = strdup("0123456789"); char *orig = strdup("0123456789");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -38,7 +38,7 @@ TEST(Fortify1_DeathTest, strcpy2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[0]; char buf[0];
char *orig = strdup(""); char *orig = strdup("");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -47,7 +47,7 @@ TEST(Fortify1_DeathTest, strcpy3_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[0]; char buf[0];
char *orig = strdup("1"); char *orig = strdup("1");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -56,7 +56,7 @@ TEST(Fortify1_DeathTest, strcpy4_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[1]; char buf[1];
char *orig = strdup("12"); char *orig = strdup("12");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -64,21 +64,21 @@ TEST(Fortify1_DeathTest, strlen_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
memcpy(buf, "0123456789", sizeof(buf)); memcpy(buf, "0123456789", sizeof(buf));
ASSERT_EXIT(printf("%d", strlen(buf)), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(printf("%d", strlen(buf)), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify1_DeathTest, strchr_fortified) { TEST(Fortify1_DeathTest, strchr_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
memcpy(buf, "0123456789", sizeof(buf)); memcpy(buf, "0123456789", sizeof(buf));
ASSERT_EXIT(printf("%s", strchr(buf, 'a')), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(printf("%s", strchr(buf, 'a')), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify1_DeathTest, strrchr_fortified) { TEST(Fortify1_DeathTest, strrchr_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
memcpy(buf, "0123456789", sizeof(buf)); memcpy(buf, "0123456789", sizeof(buf));
ASSERT_EXIT(printf("%s", strrchr(buf, 'a')), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(printf("%s", strrchr(buf, 'a')), testing::KilledBySignal(SIGABRT), "");
} }
#endif #endif
@@ -87,7 +87,7 @@ TEST(Fortify1_DeathTest, sprintf_fortified) {
char buf[10]; char buf[10];
char source_buf[15]; char source_buf[15];
memcpy(source_buf, "12345678901234", 15); memcpy(source_buf, "12345678901234", 15);
ASSERT_EXIT(sprintf(buf, "%s", source_buf), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(sprintf(buf, "%s", source_buf), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify1_DeathTest, strncat_fortified) { TEST(Fortify1_DeathTest, strncat_fortified) {
@@ -95,7 +95,7 @@ TEST(Fortify1_DeathTest, strncat_fortified) {
char buf[10]; char buf[10];
size_t n = atoi("10"); // avoid compiler optimizations size_t n = atoi("10"); // avoid compiler optimizations
strncpy(buf, "012345678", n); strncpy(buf, "012345678", n);
ASSERT_EXIT(strncat(buf, "9", n), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strncat(buf, "9", n), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify1_DeathTest, strncat2_fortified) { TEST(Fortify1_DeathTest, strncat2_fortified) {
@@ -103,7 +103,7 @@ TEST(Fortify1_DeathTest, strncat2_fortified) {
char buf[10]; char buf[10];
buf[0] = '\0'; buf[0] = '\0';
size_t n = atoi("10"); // avoid compiler optimizations size_t n = atoi("10"); // avoid compiler optimizations
ASSERT_EXIT(strncat(buf, "0123456789", n), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strncat(buf, "0123456789", n), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify1_DeathTest, strcat_fortified) { TEST(Fortify1_DeathTest, strcat_fortified) {
@@ -112,7 +112,7 @@ TEST(Fortify1_DeathTest, strcat_fortified) {
strcpy(src, "0123456789"); strcpy(src, "0123456789");
char buf[10]; char buf[10];
buf[0] = '\0'; buf[0] = '\0';
ASSERT_EXIT(strcat(buf, src), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcat(buf, src), testing::KilledBySignal(SIGABRT), "");
} }
extern "C" char* __strncat_chk(char*, const char*, size_t, size_t); extern "C" char* __strncat_chk(char*, const char*, size_t, size_t);

46
tests/fortify2_test.cpp
View File

@@ -34,7 +34,7 @@ TEST(Fortify2_DeathTest, strncpy_fortified2) {
foo myfoo; foo myfoo;
int copy_amt = atoi("11"); int copy_amt = atoi("11");
ASSERT_EXIT(strncpy(myfoo.a, "01234567890", copy_amt), ASSERT_EXIT(strncpy(myfoo.a, "01234567890", copy_amt),
testing::KilledBySignal(SIGSEGV), ""); testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, sprintf_fortified2) { TEST(Fortify2_DeathTest, sprintf_fortified2) {
@@ -43,7 +43,7 @@ TEST(Fortify2_DeathTest, sprintf_fortified2) {
char source_buf[15]; char source_buf[15];
memcpy(source_buf, "12345678901234", 15); memcpy(source_buf, "12345678901234", 15);
ASSERT_EXIT(sprintf(myfoo.a, "%s", source_buf), ASSERT_EXIT(sprintf(myfoo.a, "%s", source_buf),
testing::KilledBySignal(SIGSEGV), ""); testing::KilledBySignal(SIGABRT), "");
} }
#if __BIONIC__ #if __BIONIC__
@@ -53,7 +53,7 @@ TEST(Fortify2_DeathTest, strcpy_fortified2) {
foo myfoo; foo myfoo;
char* src = strdup(""); char* src = strdup("");
ASSERT_EXIT(strcpy(myfoo.empty, src), ASSERT_EXIT(strcpy(myfoo.empty, src),
testing::KilledBySignal(SIGSEGV), ""); testing::KilledBySignal(SIGABRT), "");
free(src); free(src);
} }
@@ -63,7 +63,7 @@ TEST(Fortify2_DeathTest, strcpy2_fortified2) {
foo myfoo; foo myfoo;
char* src = strdup("1"); char* src = strdup("1");
ASSERT_EXIT(strcpy(myfoo.empty, src), ASSERT_EXIT(strcpy(myfoo.empty, src),
testing::KilledBySignal(SIGSEGV), ""); testing::KilledBySignal(SIGABRT), "");
free(src); free(src);
} }
@@ -73,7 +73,7 @@ TEST(Fortify2_DeathTest, strcpy3_fortified2) {
foo myfoo; foo myfoo;
char* src = strdup("12"); char* src = strdup("12");
ASSERT_EXIT(strcpy(myfoo.one, src), ASSERT_EXIT(strcpy(myfoo.one, src),
testing::KilledBySignal(SIGSEGV), ""); testing::KilledBySignal(SIGABRT), "");
free(src); free(src);
} }
@@ -83,7 +83,7 @@ TEST(Fortify2_DeathTest, strchr_fortified2) {
memcpy(myfoo.a, "0123456789", sizeof(myfoo.a)); memcpy(myfoo.a, "0123456789", sizeof(myfoo.a));
myfoo.b[0] = '\0'; myfoo.b[0] = '\0';
ASSERT_EXIT(printf("%s", strchr(myfoo.a, 'a')), ASSERT_EXIT(printf("%s", strchr(myfoo.a, 'a')),
testing::KilledBySignal(SIGSEGV), ""); testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strrchr_fortified2) { TEST(Fortify2_DeathTest, strrchr_fortified2) {
@@ -92,7 +92,7 @@ TEST(Fortify2_DeathTest, strrchr_fortified2) {
memcpy(myfoo.a, "0123456789", 10); memcpy(myfoo.a, "0123456789", 10);
memcpy(myfoo.b, "01234", 6); memcpy(myfoo.b, "01234", 6);
ASSERT_EXIT(printf("%s", strrchr(myfoo.a, 'a')), ASSERT_EXIT(printf("%s", strrchr(myfoo.a, 'a')),
testing::KilledBySignal(SIGSEGV), ""); testing::KilledBySignal(SIGABRT), "");
} }
#endif #endif
@@ -101,7 +101,7 @@ TEST(Fortify2_DeathTest, strncat_fortified2) {
foo myfoo; foo myfoo;
size_t n = atoi("10"); // avoid compiler optimizations size_t n = atoi("10"); // avoid compiler optimizations
strncpy(myfoo.a, "012345678", n); strncpy(myfoo.a, "012345678", n);
ASSERT_EXIT(strncat(myfoo.a, "9", n), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strncat(myfoo.a, "9", n), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strncat2_fortified2) { TEST(Fortify2_DeathTest, strncat2_fortified2) {
@@ -109,7 +109,7 @@ TEST(Fortify2_DeathTest, strncat2_fortified2) {
foo myfoo; foo myfoo;
myfoo.a[0] = '\0'; myfoo.a[0] = '\0';
size_t n = atoi("10"); // avoid compiler optimizations size_t n = atoi("10"); // avoid compiler optimizations
ASSERT_EXIT(strncat(myfoo.a, "0123456789", n), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strncat(myfoo.a, "0123456789", n), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strncat3_fortified2) { TEST(Fortify2_DeathTest, strncat3_fortified2) {
@@ -118,7 +118,7 @@ TEST(Fortify2_DeathTest, strncat3_fortified2) {
memcpy(myfoo.a, "0123456789", sizeof(myfoo.a)); // unterminated string memcpy(myfoo.a, "0123456789", sizeof(myfoo.a)); // unterminated string
myfoo.b[0] = '\0'; myfoo.b[0] = '\0';
size_t n = atoi("10"); // avoid compiler optimizations size_t n = atoi("10"); // avoid compiler optimizations
ASSERT_EXIT(strncat(myfoo.b, myfoo.a, n), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strncat(myfoo.b, myfoo.a, n), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strcat_fortified2) { TEST(Fortify2_DeathTest, strcat_fortified2) {
@@ -127,7 +127,7 @@ TEST(Fortify2_DeathTest, strcat_fortified2) {
strcpy(src, "0123456789"); strcpy(src, "0123456789");
foo myfoo; foo myfoo;
myfoo.a[0] = '\0'; myfoo.a[0] = '\0';
ASSERT_EXIT(strcat(myfoo.a, src), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcat(myfoo.a, src), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strcat2_fortified2) { TEST(Fortify2_DeathTest, strcat2_fortified2) {
@@ -135,7 +135,7 @@ TEST(Fortify2_DeathTest, strcat2_fortified2) {
foo myfoo; foo myfoo;
memcpy(myfoo.a, "0123456789", sizeof(myfoo.a)); // unterminated string memcpy(myfoo.a, "0123456789", sizeof(myfoo.a)); // unterminated string
myfoo.b[0] = '\0'; myfoo.b[0] = '\0';
ASSERT_EXIT(strcat(myfoo.b, myfoo.a), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcat(myfoo.b, myfoo.a), testing::KilledBySignal(SIGABRT), "");
} }
/***********************************************************/ /***********************************************************/
@@ -148,7 +148,7 @@ TEST(Fortify2_DeathTest, strcpy_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
char *orig = strdup("0123456789"); char *orig = strdup("0123456789");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -157,7 +157,7 @@ TEST(Fortify2_DeathTest, strcpy2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[0]; char buf[0];
char *orig = strdup(""); char *orig = strdup("");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -166,7 +166,7 @@ TEST(Fortify2_DeathTest, strcpy3_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[0]; char buf[0];
char *orig = strdup("1"); char *orig = strdup("1");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -175,7 +175,7 @@ TEST(Fortify2_DeathTest, strcpy4_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[1]; char buf[1];
char *orig = strdup("12"); char *orig = strdup("12");
ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcpy(buf, orig), testing::KilledBySignal(SIGABRT), "");
free(orig); free(orig);
} }
@@ -183,21 +183,21 @@ TEST(Fortify2_DeathTest, strlen_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
memcpy(buf, "0123456789", sizeof(buf)); memcpy(buf, "0123456789", sizeof(buf));
ASSERT_EXIT(printf("%d", strlen(buf)), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(printf("%d", strlen(buf)), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strchr_fortified) { TEST(Fortify2_DeathTest, strchr_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
memcpy(buf, "0123456789", sizeof(buf)); memcpy(buf, "0123456789", sizeof(buf));
ASSERT_EXIT(printf("%s", strchr(buf, 'a')), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(printf("%s", strchr(buf, 'a')), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strrchr_fortified) { TEST(Fortify2_DeathTest, strrchr_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10]; char buf[10];
memcpy(buf, "0123456789", sizeof(buf)); memcpy(buf, "0123456789", sizeof(buf));
ASSERT_EXIT(printf("%s", strrchr(buf, 'a')), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(printf("%s", strrchr(buf, 'a')), testing::KilledBySignal(SIGABRT), "");
} }
#endif #endif
@@ -206,7 +206,7 @@ TEST(Fortify2_DeathTest, sprintf_fortified) {
char buf[10]; char buf[10];
char source_buf[15]; char source_buf[15];
memcpy(source_buf, "12345678901234", 15); memcpy(source_buf, "12345678901234", 15);
ASSERT_EXIT(sprintf(buf, "%s", source_buf), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(sprintf(buf, "%s", source_buf), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strncat_fortified) { TEST(Fortify2_DeathTest, strncat_fortified) {
@@ -214,7 +214,7 @@ TEST(Fortify2_DeathTest, strncat_fortified) {
char buf[10]; char buf[10];
size_t n = atoi("10"); // avoid compiler optimizations size_t n = atoi("10"); // avoid compiler optimizations
strncpy(buf, "012345678", n); strncpy(buf, "012345678", n);
ASSERT_EXIT(strncat(buf, "9", n), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strncat(buf, "9", n), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strncat2_fortified) { TEST(Fortify2_DeathTest, strncat2_fortified) {
@@ -222,7 +222,7 @@ TEST(Fortify2_DeathTest, strncat2_fortified) {
char buf[10]; char buf[10];
buf[0] = '\0'; buf[0] = '\0';
size_t n = atoi("10"); // avoid compiler optimizations size_t n = atoi("10"); // avoid compiler optimizations
ASSERT_EXIT(strncat(buf, "0123456789", n), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strncat(buf, "0123456789", n), testing::KilledBySignal(SIGABRT), "");
} }
TEST(Fortify2_DeathTest, strcat_fortified) { TEST(Fortify2_DeathTest, strcat_fortified) {
@@ -231,5 +231,5 @@ TEST(Fortify2_DeathTest, strcat_fortified) {
strcpy(src, "0123456789"); strcpy(src, "0123456789");
char buf[10]; char buf[10];
buf[0] = '\0'; buf[0] = '\0';
ASSERT_EXIT(strcat(buf, src), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(strcat(buf, src), testing::KilledBySignal(SIGABRT), "");
} }

2
tests/stack_protector_test.cpp
View File

@@ -119,7 +119,7 @@ static void do_modify_stack_chk_guard() {
TEST(stack_protector_DeathTest, modify_stack_protector) { TEST(stack_protector_DeathTest, modify_stack_protector) {
::testing::FLAGS_gtest_death_test_style = "threadsafe"; ::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(do_modify_stack_chk_guard(), testing::KilledBySignal(SIGSEGV), ""); ASSERT_EXIT(do_modify_stack_chk_guard(), testing::KilledBySignal(SIGABRT), "");
} }
#endif #endif