commit ca3f638f9628fddd0f713c932cca8818c1898890
author Steven Moreland <smoreland@google.com> Thu May 11 23:23:26 2023 +0000
committer Steven Moreland <smoreland@google.com> Fri May 12 22:31:29 2023 +0000
tree 8e8c338cf250af1c773e526afd356f3236c0411f
parent 71ea90d35134e972978f92add142857a10104552

libbinder: RpcServer protocol version error

Return an error if you set an invalid protocol
version on an RpcServer.

Previously, this would cause errors later down
the line.

Bug: 278946301
Test: binderRpcTest
Change-Id: Id496f1d39b2a32ce775e585f7690ae59503dc3aa

libs/binder/RpcSession.cpp

diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index fbad0f7..c3dee16 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -104,11 +104,7 @@
 }
 
 bool RpcSession::setProtocolVersionInternal(uint32_t version, bool checkStarted) {
-    if (version >= RPC_WIRE_PROTOCOL_VERSION_NEXT &&
-        version != RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL) {
-        ALOGE("Cannot start RPC session with version %u which is unknown (current protocol version "
-              "is %u).",
-              version, RPC_WIRE_PROTOCOL_VERSION);
+    if (!RpcState::validateProtocolVersion(version)) {
         return false;
     }