commit 9511660f9320b7dea169f39d88d81f4457886325
author Florian Mayer <fmayer@google.com> Mon Apr 12 14:02:07 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 12 14:02:07 2021 +0000
tree 35977edeacac8d0bf985afad63b80d514bf1080d
parent e1067c911cb3153b05b1f5b1dbcd86842deb94e5
parent 5fd859d098f75ee80624ef032deab1ac33413c8b

Merge "Fix shared_ring_buffer_fuzzer."

src/profiling/memory/scoped_spinlock.h

diff --git a/src/profiling/memory/scoped_spinlock.h b/src/profiling/memory/scoped_spinlock.h
index aeda611..90aaf71 100644
--- a/src/profiling/memory/scoped_spinlock.h
+++ b/src/profiling/memory/scoped_spinlock.h
@@ -29,8 +29,8 @@
 namespace profiling {
 
 struct Spinlock {
-  std::atomic<bool> locked;
-  std::atomic<bool> poisoned;
+  std::atomic<uint8_t> locked;
+  std::atomic<uint8_t> poisoned;
 };
 
 static_assert(sizeof(Spinlock) == 2, "spinlock size must be ABI independent");

src/profiling/memory/shared_ring_buffer_fuzzer.cc

diff --git a/src/profiling/memory/shared_ring_buffer_fuzzer.cc b/src/profiling/memory/shared_ring_buffer_fuzzer.cc
index d3c4bd5..2a597a9 100644
--- a/src/profiling/memory/shared_ring_buffer_fuzzer.cc
+++ b/src/profiling/memory/shared_ring_buffer_fuzzer.cc
@@ -65,6 +65,7 @@
   SharedRingBuffer::MetadataPage header = {};
   memcpy(&header, data, sizeof(header));
   header.spinlock.locked = false;
+  header.spinlock.poisoned = false;
 
   PERFETTO_CHECK(ftruncate(*fd, static_cast<off_t>(total_size_pages *
                                                    base::kPageSize)) == 0);