Skip to content

Commit

Permalink
Merge pull request #151 from trailofbits/take_over_rand
Browse files Browse the repository at this point in the history 
If you include DeepState, then rand() is actually DeepState_Int()
  • Loading branch information
@pgoodman
pgoodman authored Dec 29, 2018
2 parents 54c42c7 + ead8c5c commit a0162e8
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 85 deletions.
92 changes: 7 additions & 85 deletions src/include/deepstate/DeepState.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
#define assume DeepState_Assume
#define check DeepState_Check

#define rand DeepState_Int
#define srand DeepState_Warn_srand

#define MAYBE(...) \
if (DeepState_Bool()) { \
__VA_ARGS__ ; \
Expand Down Expand Up @@ -445,6 +448,8 @@ static bool DeepState_IsTestCaseFile(const char *name) {
return false;
}

extern void DeepState_Warn_srand(unsigned int seed);

/* Resets the global `DeepState_Input` buffer, then fills it with the
* data found in the file `path`. */
static void DeepState_InitInputFromFile(const char *path) {
Expand Down Expand Up @@ -603,36 +608,7 @@ DeepState_ForkAndRunTest(struct DeepState_TestInfo *test) {
return DeepState_TestRunCrash;
}

/* Run a test case with input initialized by fuzzing. */
static enum DeepState_TestRunResult
DeepState_FuzzOneTestCase(struct DeepState_TestInfo *test) {
DeepState_InputIndex = 0;

for (int i = 0; i < DeepState_InputSize; i++) {
DeepState_Input[i] = (char)rand();
}

DeepState_Begin(test);

enum DeepState_TestRunResult result = DeepState_ForkAndRunTest(test);

if (result == DeepState_TestRunCrash) {
DeepState_LogFormat(DeepState_LogError, "Crashed: %s", test->test_name);

if (HAS_FLAG_output_test_dir) {
DeepState_SaveCrashingTest();
}

DeepState_Crash();
}

if (FLAGS_abort_on_fail && ((result == DeepState_TestRunCrash) ||
(result == DeepState_TestRunFail))) {
abort();
}

return result;
}
extern enum DeepState_TestRunResult DeepState_FuzzOneTestCase(struct DeepState_TestInfo *test);

/* Run a single saved test case with input initialized from the file
* `name` in directory `dir`. */
Expand Down Expand Up @@ -757,61 +733,7 @@ static int DeepState_RunSingleSavedTestCase(void) {
return num_failed_tests;
}

/* Fuzz test `FLAGS_input_which_test` or first test, if not defined. */
static int DeepState_Fuzz(void) {
DeepState_LogFormat(DeepState_LogInfo, "Starting fuzzing");

if (HAS_FLAG_seed) {
srand(FLAGS_seed);
} else {
unsigned int seed = time(NULL);
DeepState_LogFormat(DeepState_LogWarning, "No seed provided; using %u", seed);
srand(seed);
}

long start = (long)time(NULL);
long current = (long)time(NULL);
long diff = 0;
unsigned i = 0;

int num_failed_tests = 0;

struct DeepState_TestInfo *test = NULL;

DeepState_Setup();

for (test = DeepState_FirstTest(); test != NULL; test = test->prev) {
if (HAS_FLAG_input_which_test) {
if (strncmp(FLAGS_input_which_test, test->test_name, strlen(FLAGS_input_which_test)) == 0) {
break;
}
} else {
DeepState_LogFormat(DeepState_LogInfo,
"No test specified, defaulting to last test defined");
break;
}
}

if (test == NULL) {
DeepState_LogFormat(DeepState_LogInfo,
"Could not find matching test for %s",
FLAGS_input_which_test);
return 0;
}

while (diff < FLAGS_timeout) {
i++;
num_failed_tests += DeepState_FuzzOneTestCase(test);

current = (long)time(NULL);
diff = current-start;
}

DeepState_LogFormat(DeepState_LogInfo, "Ran %u tests. %d failed tests.",
i, num_failed_tests);

return num_failed_tests;
}
extern int DeepState_Fuzz(void);

/* Run tests from `FLAGS_input_test_files_dir`, under `FLAGS_input_which_test`
* or first test, if not defined. */
Expand Down
97 changes: 97 additions & 0 deletions src/lib/DeepState.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
#include <setjmp.h>
#include <stdio.h>

#undef rand
#undef srand

DEEPSTATE_BEGIN_EXTERN_C

DEFINE_uint(num_workers, 1,
Expand Down Expand Up @@ -454,6 +457,11 @@ void DrMemFuzzFunc(volatile uint8_t *buff, size_t size) {
}
}

void DeepState_Warn_srand(unsigned int seed) {
DeepState_LogFormat(DeepState_LogWarning,
"srand under DeepState has no effect: rand is re-defined as DeepState_Int");
}

void DeepState_RunSavedTakeOverCases(jmp_buf env,
struct DeepState_TestInfo *test) {
int num_failed_tests = 0;
Expand Down Expand Up @@ -630,6 +638,95 @@ bool DeepState_CatchAbandoned(void) {
return DeepState_CurrentTestRun->result == DeepState_TestRunAbandon;
}

/* Fuzz test `FLAGS_input_which_test` or first test, if not defined.
Has to be defined here since we redefine rand in the header. */
int DeepState_Fuzz(void){
DeepState_LogFormat(DeepState_LogInfo, "Starting fuzzing");

if (HAS_FLAG_seed) {
srand(FLAGS_seed);
} else {
unsigned int seed = time(NULL);
DeepState_LogFormat(DeepState_LogWarning, "No seed provided; using %u", seed);
srand(seed);
}

long start = (long)time(NULL);
long current = (long)time(NULL);
long diff = 0;
unsigned i = 0;

int num_failed_tests = 0;

struct DeepState_TestInfo *test = NULL;

DeepState_Setup();

for (test = DeepState_FirstTest(); test != NULL; test = test->prev) {
if (HAS_FLAG_input_which_test) {
if (strncmp(FLAGS_input_which_test, test->test_name, strlen(FLAGS_input_which_test)) == 0) {
break;
}
} else {
DeepState_LogFormat(DeepState_LogInfo,
"No test specified, defaulting to last test defined");
break;
}
}

if (test == NULL) {
DeepState_LogFormat(DeepState_LogInfo,
"Could not find matching test for %s",
FLAGS_input_which_test);
return 0;
}

while (diff < FLAGS_timeout) {
i++;
num_failed_tests += DeepState_FuzzOneTestCase(test);

current = (long)time(NULL);
diff = current-start;
}

DeepState_LogFormat(DeepState_LogInfo, "Ran %u tests. %d failed tests.",
i, num_failed_tests);

return num_failed_tests;
}


/* Run a test case with input initialized by fuzzing.
Has to be defined here since we redefine rand in the header. */
enum DeepState_TestRunResult DeepState_FuzzOneTestCase(struct DeepState_TestInfo *test) {
DeepState_InputIndex = 0;

for (int i = 0; i < DeepState_InputSize; i++) {
DeepState_Input[i] = (char)rand();
}

DeepState_Begin(test);

enum DeepState_TestRunResult result = DeepState_ForkAndRunTest(test);

if (result == DeepState_TestRunCrash) {
DeepState_LogFormat(DeepState_LogError, "Crashed: %s", test->test_name);

if (HAS_FLAG_output_test_dir) {
DeepState_SaveCrashingTest();
}

DeepState_Crash();
}

if (FLAGS_abort_on_fail && ((result == DeepState_TestRunCrash) ||
(result == DeepState_TestRunFail))) {
abort();
}

return result;
}

extern int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
if (Size > sizeof(DeepState_Input)) {
return 0; // Just ignore any too-big inputs
Expand Down

0 comments on commit a0162e8

Please sign in to comment.