Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow tests to read all the variable-size concrete data #310

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/include/deepstate/DeepState.h
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ extern const char *DeepState_ConcretizeCStr(const char *begin);
/* Allocate and return a pointer to `num_bytes` symbolic bytes. */
extern void *DeepState_Malloc(size_t num_bytes);

/* Allocate all the concrete inputs and return a pointer to `num_bytes` symbolic bytes. */
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe rename to MallocAllConcreteInputBytes?

extern void *DeepState_MallocAll(size_t *num_bytes);

/* Returns the path to a testcase without parsing to any aforementioned types */
extern const char *DeepState_InputPath(char *testcase_path);

Expand Down
9 changes: 9 additions & 0 deletions src/lib/DeepState.c
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ static struct DeepState_TestInfo *DeepState_DrFuzzTest = NULL;
/* Initialize global input buffer and index. */
volatile uint8_t DeepState_Input[DeepState_InputSize] = {};
uint32_t DeepState_InputIndex = 0;
uint32_t DeepState_ConcreteInputIndex = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment explaining what this is for.


/* Swarm related state. */
uint32_t DeepState_SwarmConfigsIndex = 0;
Expand Down Expand Up @@ -380,6 +381,13 @@ void *DeepState_Malloc(size_t num_bytes) {
return data;
}

/* Allocate all the available concrete input, update the `num_bytes` pointer and return a pointer to symbolic bytes. */
void *DeepState_MallocAll(size_t *num_bytes) {
*num_bytes = DeepState_ConcreteInputIndex;
DeepState_ConcreteInputIndex = 0;
return DeepState_Malloc(*num_bytes);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this use GCMalloc?

}

/* Portable and architecture-independent memory scrub without dead store elimination. */
void *DeepState_MemScrub(void *pointer, size_t data_size) {
volatile unsigned char *p = pointer;
Expand Down Expand Up @@ -1183,6 +1191,7 @@ extern int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
DeepState_SwarmConfigsIndex = 0;

memcpy((void *) DeepState_Input, (void *) Data, Size);
DeepState_ConcreteInputIndex = Size;

DeepState_Begin(test);

Expand Down