From ce812a22ca63d74ba48e0a7ebb0ea521837b2efd Mon Sep 17 00:00:00 2001
From: Tri Vo <trong@google.com>
Date: Wed, 10 Feb 2021 13:31:22 -0800
Subject: trusty: Fix up error messages

Bug: 171750250
Test: m
Change-Id: I41cde13a891da36c85df6a451b2d051c18365797
---
 trusty/coverage/coverage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'trusty/coverage/coverage.cpp')

diff --git a/trusty/coverage/coverage.cpp b/trusty/coverage/coverage.cpp
index 5eccdc503..9613d0fb5 100644
--- a/trusty/coverage/coverage.cpp
+++ b/trusty/coverage/coverage.cpp
@@ -130,7 +130,7 @@ Result<void> CoverageRecord::Open() {
     req.open_args.uuid = uuid_;
     auto ret = Rpc(&req, -1, &resp);
     if (!ret.ok()) {
-        return Error() << "failed to open coverage client: ";
+        return Error() << "failed to open coverage client: " << ret.error();
     }
     record_len_ = resp.open_args.record_len;
     shm_len_ = RoundPageUp(record_len_);
@@ -153,7 +153,7 @@ Result<void> CoverageRecord::Open() {
     req.share_record_args.shm_len = shm_len_;
     ret = Rpc(&req, dma_buf, &resp);
     if (!ret.ok()) {
-        return Error() << "failed to send shared memory: ";
+        return Error() << "failed to send shared memory: " << ret.error();
     }
 
     shm_ = shm;
-- 
cgit v1.2.3


From 19eccb4f51ffd68944540ddee771faadbf49b54b Mon Sep 17 00:00:00 2001
From: Tri Vo <trong@google.com>
Date: Wed, 10 Feb 2021 15:29:57 -0800
Subject: trusty: Allow fuzzing without coverage

Bug: 171750250
Test: m
Change-Id: I9e4cbf11fd223092f9ad800b35d0502c27f71e8f
---
 trusty/coverage/coverage.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'trusty/coverage/coverage.cpp')

diff --git a/trusty/coverage/coverage.cpp b/trusty/coverage/coverage.cpp
index 9613d0fb5..3c6b5c510 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 @@ Result<void> CoverageRecord::Open() {
 
     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 @@ Result<void> CoverageRecord::Open() {
     return {};
 }
 
+bool CoverageRecord::IsOpen() {
+    return shm_;
+}
+
 void CoverageRecord::ResetFullRecord() {
     auto header_region = GetRegionBounds(COV_START);
     if (!header_region.ok()) {
-- 
cgit v1.2.3