diff --git a/trusty/fuzz/include/trusty/fuzz/utils.h b/trusty/fuzz/include/trusty/fuzz/utils.h index bca84e96d..c90641258 100644 --- a/trusty/fuzz/include/trusty/fuzz/utils.h +++ b/trusty/fuzz/include/trusty/fuzz/utils.h @@ -34,6 +34,7 @@ class TrustyApp { android::base::Result Connect(); android::base::Result Read(void* buf, size_t len); android::base::Result Write(const void* buf, size_t len); + void Disconnect(); android::base::Result GetRawFd(); diff --git a/trusty/fuzz/tipc_fuzzer.cpp b/trusty/fuzz/tipc_fuzzer.cpp index 325894470..f265cedb6 100644 --- a/trusty/fuzz/tipc_fuzzer.cpp +++ b/trusty/fuzz/tipc_fuzzer.cpp @@ -41,6 +41,7 @@ using android::trusty::fuzz::TrustyApp; #error "Binary file name must be parameterized using -DTRUSTY_APP_FILENAME." #endif +static TrustyApp kTrustyApp(TIPC_DEV, TRUSTY_APP_PORT); static std::unique_ptr record; extern "C" int LLVMFuzzerInitialize(int* /* argc */, char*** /* argv */) { @@ -52,8 +53,7 @@ extern "C" int LLVMFuzzerInitialize(int* /* argc */, char*** /* argv */) { } /* Make sure lazy-loaded TAs have started and connected to coverage service. */ - TrustyApp ta(TIPC_DEV, TRUSTY_APP_PORT); - auto ret = ta.Connect(); + auto ret = kTrustyApp.Connect(); if (!ret.ok()) { std::cerr << ret.error() << std::endl; exit(-1); @@ -79,22 +79,18 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { ExtraCounters counters(record.get()); counters.Reset(); - TrustyApp ta(TIPC_DEV, TRUSTY_APP_PORT); - auto ret = ta.Connect(); + auto ret = kTrustyApp.Write(data, size); + if (ret.ok()) { + ret = kTrustyApp.Read(&buf, sizeof(buf)); + } + + // Reconnect to ensure that the service is still up + kTrustyApp.Disconnect(); + ret = kTrustyApp.Connect(); if (!ret.ok()) { std::cerr << ret.error() << std::endl; android::trusty::fuzz::Abort(); } - ret = ta.Write(data, size); - if (!ret.ok()) { - return -1; - } - - ret = ta.Read(&buf, sizeof(buf)); - if (!ret.ok()) { - return -1; - } - - return 0; + return ret.ok() ? 0 : -1; } diff --git a/trusty/fuzz/utils.cpp b/trusty/fuzz/utils.cpp index 35263373b..bb096beab 100644 --- a/trusty/fuzz/utils.cpp +++ b/trusty/fuzz/utils.cpp @@ -127,6 +127,10 @@ Result TrustyApp::GetRawFd() { return ta_fd_; } +void TrustyApp::Disconnect() { + ta_fd_.reset(); +} + void Abort() { PrintTrustyLog(); exit(-1);