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

am 78a7bf99: Merge "stdio.h: enable vs?printf clang FORTIFY_SOURCE"

Browse Source 
* commit '78a7bf998d2d29592504984fcf419cd2701c6c54':
  stdio.h: enable vs?printf clang FORTIFY_SOURCE
This commit is contained in:
Nick Kralevich 2013-06-27 10:15:31 -07:00 committed by Android Git Automerger
commit f9ef0106da
5 changed files with 219 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/include/stdio.h
View File

@ -454,7 +454,6 @@ __END_DECLS
__BEGIN_DECLS
#if !defined(__clang__)
__BIONIC_FORTIFY_INLINE
__printflike(3, 0)
int vsnprintf(char *dest, size_t size, const char *format, __va_list ap)
@ -468,7 +467,6 @@ int vsprintf(char *dest, const char *format, __va_list ap)
{
return __builtin___vsprintf_chk(dest, 0, __bos(dest), format, ap);
}
#endif /* !defined(__clang__) */
#if defined(__clang__)
#define snprintf(dest, size, ...) __builtin___snprintf_chk(dest, size, 0, __bos(dest), __VA_ARGS__)

44
tests/fortify1_test.cpp
View File

@ -19,6 +19,7 @@
#include <gtest/gtest.h>
#include <string.h>
#include <stdarg.h>
#if __BIONIC__
// We have to say "DeathTest" here so gtest knows to run this test (which exits)
@ -106,6 +107,49 @@ TEST(Fortify1_DeathTest, sprintf2_fortified) {
ASSERT_EXIT(sprintf(buf, "aaaaa"), testing::KilledBySignal(SIGABRT), "");
}
static int vsprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
va_start(va, fmt);
result = vsprintf(buf, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify1_DeathTest, vsprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify1_DeathTest, vsprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
static int vsnprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
size_t size = atoi("11");
va_start(va, fmt);
result = vsnprintf(buf, size, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify1_DeathTest, vsnprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify1_DeathTest, vsnprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify1_DeathTest, strncat_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10];

44
tests/fortify1_test_clang.cpp
View File

@ -19,6 +19,7 @@
#include <gtest/gtest.h>
#include <string.h>
#include <stdarg.h>
#if __BIONIC__
// We have to say "DeathTest" here so gtest knows to run this test (which exits)
@ -106,6 +107,49 @@ TEST(Fortify1_Clang_DeathTest, sprintf2_fortified) {
ASSERT_EXIT(sprintf(buf, "aaaaa"), testing::KilledBySignal(SIGABRT), "");
}
static int vsprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
va_start(va, fmt);
result = vsprintf(buf, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify1_Clang_DeathTest, vsprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify1_Clang_DeathTest, vsprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
static int vsnprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
size_t size = atoi("11");
va_start(va, fmt);
result = vsnprintf(buf, size, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify1_Clang_DeathTest, vsnprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify1_Clang_DeathTest, vsnprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify1_Clang_DeathTest, strncat_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10];

87
tests/fortify2_test.cpp
View File

@ -19,6 +19,7 @@
#include <gtest/gtest.h>
#include <string.h>
#include <stdarg.h>
struct foo {
char empty[0];
@ -53,6 +54,49 @@ TEST(Fortify2_DeathTest, sprintf2_fortified2) {
testing::KilledBySignal(SIGABRT), "");
}
static int vsprintf_helper2(const char *fmt, ...) {
foo myfoo;
va_list va;
int result;
va_start(va, fmt);
result = vsprintf(myfoo.a, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify2_DeathTest, vsprintf_fortified2) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper2("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_DeathTest, vsprintf2_fortified2) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper2("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
static int vsnprintf_helper2(const char *fmt, ...) {
foo myfoo;
va_list va;
int result;
size_t size = atoi("11");
va_start(va, fmt);
result = vsnprintf(myfoo.a, size, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify2_DeathTest, vsnprintf_fortified2) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper2("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_DeathTest, vsnprintf2_fortified2) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper2("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
#if __BIONIC__
// zero sized target with "\0" source (should fail)
TEST(Fortify2_DeathTest, strcpy_fortified2) {
@ -250,6 +294,49 @@ TEST(Fortify2_DeathTest, sprintf2_fortified) {
ASSERT_EXIT(sprintf(buf, "aaaaa"), testing::KilledBySignal(SIGABRT), "");
}
static int vsprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
va_start(va, fmt);
result = vsprintf(buf, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify2_DeathTest, vsprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_DeathTest, vsprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
static int vsnprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
size_t size = atoi("11");
va_start(va, fmt);
result = vsnprintf(buf, size, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify2_DeathTest, vsnprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_DeathTest, vsnprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_DeathTest, strncat_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10];

44
tests/fortify2_test_clang.cpp
View File

@ -19,6 +19,7 @@
#include <gtest/gtest.h>
#include <string.h>
#include <stdarg.h>
struct foo {
char empty[0];
@ -123,6 +124,49 @@ TEST(Fortify2_Clang_DeathTest, sprintf2_fortified) {
ASSERT_EXIT(sprintf(buf, "aaaaa"), testing::KilledBySignal(SIGABRT), "");
}
static int vsprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
va_start(va, fmt);
result = vsprintf(buf, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify2_Clang_DeathTest, vsprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_Clang_DeathTest, vsprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
static int vsnprintf_helper(const char *fmt, ...) {
char buf[10];
va_list va;
int result;
size_t size = atoi("11");
va_start(va, fmt);
result = vsnprintf(buf, size, fmt, va); // should crash here
va_end(va);
return result;
}
TEST(Fortify2_Clang_DeathTest, vsnprintf_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("%s", "0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_Clang_DeathTest, vsnprintf2_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
ASSERT_EXIT(vsnprintf_helper("0123456789"), testing::KilledBySignal(SIGABRT), "");
}
TEST(Fortify2_Clang_DeathTest, strncat_fortified) {
::testing::FLAGS_gtest_death_test_style = "threadsafe";
char buf[10];