commit 19eccb4f51ffd68944540ddee771faadbf49b54b
author Tri Vo <trong@google.com> Wed Feb 10 15:29:57 2021 -0800
committer Tri Vo <trong@google.com> Wed Feb 10 16:46:24 2021 -0800
tree 8ed834486494dc1c4ef9fa716abc770328a7f906
parent ce812a22ca63d74ba48e0a7ebb0ea521837b2efd

trusty: Allow fuzzing without coverage

Bug: 171750250
Test: m
Change-Id: I9e4cbf11fd223092f9ad800b35d0502c27f71e8f

trusty/coverage/coverage.cpp

diff --git a/trusty/coverage/coverage.cpp b/trusty/coverage/coverage.cpp
index 9613d0f..3c6b5c5 100644
--- a/trusty/coverage/coverage.cpp
+++ b/trusty/coverage/coverage.cpp
@@ -29,6 +29,7 @@
 #include <trusty/coverage/record.h>
 #include <trusty/coverage/tipc.h>
 #include <trusty/tipc.h>
+#include <iostream>
 
 #define COVERAGE_CLIENT_PORT "com.android.trusty.coverage.client"
 
@@ -122,7 +123,9 @@
 
     int fd = tipc_connect(tipc_dev_.c_str(), COVERAGE_CLIENT_PORT);
     if (fd < 0) {
-        return ErrnoError() << "failed to connect to Trusty coverarge server: ";
+        // Don't error out to support fuzzing builds without coverage, e.g. for repros.
+        std::cerr << "WARNING!!! Failed to connect to Trusty coverarge server." << std::endl;
+        return {};
     }
     coverage_srv_fd_.reset(fd);
 
@@ -160,6 +163,10 @@
     return {};
 }
 
+bool CoverageRecord::IsOpen() {
+    return shm_;
+}
+
 void CoverageRecord::ResetFullRecord() {
     auto header_region = GetRegionBounds(COV_START);
     if (!header_region.ok()) {