diff options
| author | Ryan Prichard <rprichard@google.com> | 2024-01-26 05:13:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-01-26 05:13:52 +0000 |
| commit | 49be29ed5bef80931b30470c25c7d1bb794e9c62 (patch) | |
| tree | 0ddd3c3e045acb47c68ceea7cfbc66dca2ac6e1e /trusty | |
| parent | ae983560a42207beb9f3b3419dd7ace28d93d4fd (diff) | |
| parent | 42a3f876ada566e0f03934795e4033bc736f437c (diff) | |
| download | core-49be29ed5bef80931b30470c25c7d1bb794e9c62.tar.gz | |
Merge "trusty: clear fuzzer's extra counters directly" into main
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/fuzz/Android.bp | 3 | ||||
| -rw-r--r-- | trusty/fuzz/counters.cpp | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/trusty/fuzz/Android.bp b/trusty/fuzz/Android.bp index 5d0ff7920..8a93e5ee7 100644 --- a/trusty/fuzz/Android.bp +++ b/trusty/fuzz/Android.bp @@ -41,9 +41,6 @@ cc_library { "utils.cpp", ], export_include_dirs: ["include"], - static_libs: [ - "libFuzzer", - ], shared_libs: [ "libtrusty_coverage", "libbase", diff --git a/trusty/fuzz/counters.cpp b/trusty/fuzz/counters.cpp index 65a3ba6f4..e730ec320 100644 --- a/trusty/fuzz/counters.cpp +++ b/trusty/fuzz/counters.cpp @@ -16,12 +16,12 @@ #define LOG_TAG "trusty-fuzz-counters" -#include <FuzzerDefs.h> - #include <trusty/fuzz/counters.h> #include <android-base/logging.h> +#include <assert.h> #include <log/log.h> +#include <string.h> #include <trusty/coverage/coverage.h> #include <trusty/coverage/tipc.h> @@ -45,9 +45,6 @@ ExtraCounters::ExtraCounters(coverage::CoverageRecord* record) : record_(record) return; } - assert(fuzzer::ExtraCountersBegin()); - assert(fuzzer::ExtraCountersEnd()); - volatile uint8_t* begin = NULL; volatile uint8_t* end = NULL; record_->GetRawCounts(&begin, &end); @@ -66,9 +63,8 @@ void ExtraCounters::Reset() { if (!record_->IsOpen()) { return; } - record_->ResetCounts(); - fuzzer::ClearExtraCounters(); + memset_explicit(const_cast<uint8_t*>(counters), 0, sizeof(counters)); } void ExtraCounters::Flush() { |