encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix generation of random indices in regex fuzzer 

Random indices were being generated in a manner that assumed the upper
bound to a Random::GetUInt call was inclusive. Also, GetUInt64 was
being used needlessly when GetUInt32 would suffice. This change
addresses both issues.

Fixes https://crbug.com/1250904

Change-Id: I9ad8e5beb3b52bcb867aeb745dec520c251cba60
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/64744
Auto-Submit: Alastair Donaldson <afdx@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Commit-Queue: Alastair Donaldson <afdx@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Alastair Donaldson 2021-09-21 16:16:58 +00:00 committed by Tint LUCI CQ
parent 1d81f83704
commit 0118b964f3
2 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuzzers/tint_regex_fuzzer/fuzzer.cc
View File

@ -59,10 +59,10 @@ extern "C" size_t LLVMFuzzerCustomMutator(uint8_t* data,
RandomGenerator generator(seed); RandomGenerator generator(seed);
std::string delimiter = std::string delimiter =
delimiters[generator.GetUInt64(delimiters.size() - 1u)]; delimiters[generator.GetUInt32(static_cast<uint32_t>(delimiters.size()))];
MutationKind mutation_kind = static_cast<MutationKind>(generator.GetUInt64( MutationKind mutation_kind = static_cast<MutationKind>(generator.GetUInt32(
static_cast<size_t>(MutationKind::kNumMutationKinds) - 1u)); static_cast<uint32_t>(MutationKind::kNumMutationKinds)));
switch (mutation_kind) { switch (mutation_kind) {
case MutationKind::kSwapIntervals: case MutationKind::kSwapIntervals:

72
fuzzers/tint_regex_fuzzer/wgsl_mutator.cc
View File

@ -145,17 +145,24 @@ bool SwapRandomIntervals(const std::string& delimiter,
return false; return false;
} }
// When generating the i-th random number, we should make sure that there are // Choose indices:
// at least (3-i) numbers greater than this number. // interval_1_start < interval_1_end <= interval_2_start < interval_2_end
size_t ind1 = generator.GetUInt64(delimiter_positions.size() - 3u); uint32_t interval_1_start = generator.GetUInt32(
size_t ind2 = generator.GetUInt64(ind1 + 1u, delimiter_positions.size() - 2u); static_cast<uint32_t>(delimiter_positions.size()) - 2u);
size_t ind3 = generator.GetUInt64(ind2, delimiter_positions.size() - 2u); uint32_t interval_1_end = generator.GetUInt32(
size_t ind4 = generator.GetUInt64(ind3 + 1u, delimiter_positions.size() - 1u); interval_1_start + 1u,
static_cast<uint32_t>(delimiter_positions.size()) - 1u);
uint32_t interval_2_start = generator.GetUInt32(
interval_1_end, static_cast<uint32_t>(delimiter_positions.size()) - 1u);
uint32_t interval_2_end = generator.GetUInt32(
interval_2_start + 1u, static_cast<uint32_t>(delimiter_positions.size()));
SwapIntervals(delimiter_positions[ind1], SwapIntervals(delimiter_positions[interval_1_start],
delimiter_positions[ind2] - delimiter_positions[ind1], delimiter_positions[interval_1_end] -
delimiter_positions[ind3], delimiter_positions[interval_1_start],
delimiter_positions[ind4] - delimiter_positions[ind3], delimiter_positions[interval_2_start],
delimiter_positions[interval_2_end] -
delimiter_positions[interval_2_start],
wgsl_code); wgsl_code);
return true; return true;
@ -172,12 +179,15 @@ bool DeleteRandomInterval(const std::string& delimiter,
return false; return false;
} }
size_t ind1 = generator.GetUInt64(delimiter_positions.size() - 2u); uint32_t interval_start = generator.GetUInt32(
size_t ind2 = generator.GetUInt64(ind1 + 1u, delimiter_positions.size() - 1u); static_cast<uint32_t>(delimiter_positions.size()) - 1u);
uint32_t interval_end = generator.GetUInt32(
interval_start + 1u, static_cast<uint32_t>(delimiter_positions.size()));
DeleteInterval(delimiter_positions[ind1], DeleteInterval(
delimiter_positions[ind2] - delimiter_positions[ind1], delimiter_positions[interval_start],
wgsl_code); delimiter_positions[interval_end] - delimiter_positions[interval_start],
wgsl_code);
return true; return true;
} }
@ -193,13 +203,17 @@ bool DuplicateRandomInterval(const std::string& delimiter,
return false; return false;
} }
size_t ind1 = generator.GetUInt64(delimiter_positions.size() - 2u); uint32_t interval_start = generator.GetUInt32(
size_t ind2 = generator.GetUInt64(ind1 + 1u, delimiter_positions.size() - 1u); static_cast<uint32_t>(delimiter_positions.size()) - 1u);
size_t ind3 = generator.GetUInt64(delimiter_positions.size() - 1u); uint32_t interval_end = generator.GetUInt32(
interval_start + 1u, static_cast<uint32_t>(delimiter_positions.size()));
uint32_t duplication_point =
generator.GetUInt32(static_cast<uint32_t>(delimiter_positions.size()));
DuplicateInterval(delimiter_positions[ind1], DuplicateInterval(
delimiter_positions[ind2] - delimiter_positions[ind1], delimiter_positions[interval_start],
delimiter_positions[ind3], wgsl_code); delimiter_positions[interval_end] - delimiter_positions[interval_start],
delimiter_positions[duplication_point], wgsl_code);
return true; return true;
} }
@ -214,12 +228,14 @@ bool ReplaceRandomIdentifier(std::string& wgsl_code,
return false; return false;
} }
size_t id1_index = generator.GetUInt64(identifiers.size() - 1u); uint32_t id1_index =
size_t id2_index = generator.GetUInt64(identifiers.size() - 1u); generator.GetUInt32(static_cast<uint32_t>(identifiers.size()));
uint32_t id2_index =
generator.GetUInt32(static_cast<uint32_t>(identifiers.size()));
// The two identifiers must be different // The two identifiers must be different
while (id1_index == id2_index) { while (id1_index == id2_index) {
id2_index = generator.GetUInt64(identifiers.size() - 1u); id2_index = generator.GetUInt32(static_cast<uint32_t>(identifiers.size()));
} }
ReplaceRegion(identifiers[id1_index].first, identifiers[id1_index].second, ReplaceRegion(identifiers[id1_index].first, identifiers[id1_index].second,
@ -238,15 +254,17 @@ bool ReplaceRandomIntLiteral(std::string& wgsl_code,
return false; return false;
} }
size_t id1_index = generator.GetUInt64(literals.size() - 1u); uint32_t literal_index =
generator.GetUInt32(static_cast<uint32_t>(literals.size()));
// INT_MAX = 2147483647, INT_MIN = -2147483648 // INT_MAX = 2147483647, INT_MIN = -2147483648
std::vector<std::string> boundary_values = { std::vector<std::string> boundary_values = {
"2147483647", "-2147483648", "1", "-1", "0", "4294967295"}; "2147483647", "-2147483648", "1", "-1", "0", "4294967295"};
size_t boundary_index = generator.GetUInt64(boundary_values.size() - 1u); uint32_t boundary_index =
generator.GetUInt32(static_cast<uint32_t>(boundary_values.size()));
ReplaceInterval(literals[id1_index].first, literals[id1_index].second, ReplaceInterval(literals[literal_index].first, literals[literal_index].second,
boundary_values[boundary_index], wgsl_code); boundary_values[boundary_index], wgsl_code);
return true; return true;