trusty: fuzz: make utils lib use libtrusty_test
Test: m libtrusty_fuzz_utils
Change-Id: Id77b87bb14f09b29f53c78a4ea89073fbe1c83a1
diff --git a/trusty/fuzz/utils.cpp b/trusty/fuzz/utils.cpp
index 240afe7..f4cf0b6 100644
--- a/trusty/fuzz/utils.cpp
+++ b/trusty/fuzz/utils.cpp
@@ -25,6 +25,7 @@
#include <linux/uio.h>
#include <log/log_read.h>
#include <time.h>
+#include <trusty/tipc.h>
#include <iostream>
using android::base::ErrnoError;
@@ -32,9 +33,6 @@
using android::base::Result;
using android::base::unique_fd;
-#define TIPC_IOC_MAGIC 'r'
-#define TIPC_IOC_CONNECT _IOW(TIPC_IOC_MAGIC, 0x80, char*)
-
namespace {
const size_t kTimeoutSeconds = 5;
@@ -80,27 +78,14 @@
: tipc_dev_(tipc_dev), ta_port_(ta_port), ta_fd_(-1) {}
Result<void> TrustyApp::Connect() {
- /*
- * TODO: We can't use libtrusty because (yet)
- * (1) cc_fuzz can't deal with vendor components (b/170753563)
- * (2) We need non-blocking behavior to detect Trusty going down.
- * (we could implement the timeout in the fuzzing code though, as
- * it needs to be around the call to read())
- */
alarm(kTimeoutSeconds);
- int fd = open(tipc_dev_.c_str(), O_RDWR);
+ int fd = tipc_connect(tipc_dev_.c_str(), ta_port_.c_str());
alarm(0);
if (fd < 0) {
return ErrnoError() << "failed to open TIPC device: ";
}
ta_fd_.reset(fd);
- // This ioctl will time out in the kernel if it can't connect.
- int rc = TEMP_FAILURE_RETRY(ioctl(ta_fd_, TIPC_IOC_CONNECT, ta_port_.c_str()));
- if (rc < 0) {
- return ErrnoError() << "failed to connect to TIPC service: ";
- }
-
return {};
}