summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrei Homescu <ahomescu@google.com> 2022-08-02 22:57:15 +0000
committer Andrei Homescu <ahomescu@google.com> 2022-08-02 23:01:09 +0000
commitb14d3e50edca61ed8ca969af0eb936a1fc9c387d (patch)
tree3002150ec1f797d6f44b3258e81b94fcd69a2fc6
parent1ea5882095daf567171009e904d60b993cd43a24 (diff)
libbinder: fix type of return value from {send,read}_msg
send_msg and read_msg in Trusty return ssize_t instead of int. This updates the return type in RpcTransportTipcTrusty to avoid some UBSan failures. Bug: 224644083 Test: atest binderRpcTest Change-Id: Id250502a6f98ab843d48812eaa95a31a9625081f
-rw-r--r--libs/binder/trusty/RpcTransportTipcTrusty.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/trusty/RpcTransportTipcTrusty.cpp b/libs/binder/trusty/RpcTransportTipcTrusty.cpp
index e0d80fbe7b..dc27eb929c 100644
--- a/libs/binder/trusty/RpcTransportTipcTrusty.cpp
+++ b/libs/binder/trusty/RpcTransportTipcTrusty.cpp
@@ -64,7 +64,7 @@ public:
.num_handles = 0, // TODO: add ancillaryFds
.handles = nullptr,
};
- int rc = send_msg(mSocket.get(), &msg);
+ ssize_t rc = send_msg(mSocket.get(), &msg);
if (rc == ERR_NOT_ENOUGH_BUFFER) {
// Peer is blocked, wait until it unblocks.
// TODO: when tipc supports a send-unblocked handler,
@@ -89,7 +89,7 @@ public:
return statusFromTrusty(rc);
}
LOG_ALWAYS_FATAL_IF(static_cast<size_t>(rc) != size,
- "Sent the wrong number of bytes %d!=%zu", rc, size);
+ "Sent the wrong number of bytes %zd!=%zu", rc, size);
return OK;
}
@@ -129,7 +129,7 @@ public:
.num_handles = 0, // TODO: support ancillaryFds
.handles = nullptr,
};
- int rc = read_msg(mSocket.get(), mMessageInfo.id, mMessageOffset, &msg);
+ ssize_t rc = read_msg(mSocket.get(), mMessageInfo.id, mMessageOffset, &msg);
if (rc < 0) {
return statusFromTrusty(rc);
}