Skip to content

Move input size limit enforcement to LegacyRunnerCallbacks. #2213

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.

Sign up for GitHub

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

Open
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move input size limit enforcement to LegacyRunnerCallbacks. #2213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions centipede/runner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,6 @@ extern "C" size_t LLVMFuzzerMutate(uint8_t* data, size_t size,
return CentipedeLLVMFuzzerMutateCallback(data, size, max_size);
}

// An arbitrary large size for input data.
static const size_t kMaxDataSize = 1 << 20;

static void WriteFeaturesToFile(FILE* file, const feature_t* features,
size_t size) {
if (!size) return;
Expand Down Expand Up @@ -510,9 +507,7 @@ static int ExecuteInputsFromShmem(BlobSequence& inputs_blobseq,
if (!blob.IsValid()) break; // no more blobs to read.
if (!IsDataInput(blob)) return EXIT_FAILURE;

// TODO(kcc): [impl] handle sizes larger than kMaxDataSize.
size_t size = std::min(kMaxDataSize, blob.size);
inputs.push_back(callbacks.DeserializeInput({blob.data, size}));
inputs.push_back(callbacks.DeserializeInput({blob.data, blob.size}));
}

CentipedeBeginExecutionBatch();
Expand Down Expand Up @@ -717,8 +712,11 @@ void LegacyRunnerCallbacks::SerializeInput(
}

void* LegacyRunnerCallbacks::DeserializeInput(ByteSpan input_bytes) {
// An arbitrary large size for input data.
static const size_t kMaxDataSize = 1 << 20;
const size_t size = std::min(input_bytes.size(), kMaxDataSize);
return reinterpret_cast<void*>(
new ByteArray{input_bytes.begin(), input_bytes.end()});
new ByteArray{input_bytes.data(), input_bytes.data() + size});
}

void LegacyRunnerCallbacks::FreeInput(void* input) {
Expand Down
Loading