[RpcSession] Add checks before setting SessionSpecificRoot

Alice Wang · Alice Wang · commit c0d50957ed77 · 2024-07-19T16:50:10.000Z
for the IAccessor flow.

Bug: 338541373
Test: atest vm_accessor_test
Change-Id: I59a2847040857805a1e6c12027271deaf509fd09
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
@@ -802,6 +802,10 @@ bool RpcSession::setForServer(const wp<RpcServer>& server, const wp<EventListene
 }
 
 void RpcSession::setSessionSpecificRoot(const sp<IBinder>& sessionSpecificRoot) {
+    LOG_ALWAYS_FATAL_IF(mSessionSpecificRootObject != nullptr,
+                        "Session specific root object already set");
+    LOG_ALWAYS_FATAL_IF(mForServer != nullptr,
+                        "Session specific root object cannot be set for a server");
     mSessionSpecificRootObject = sessionSpecificRoot;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -802,6 +802,10 @@ bool RpcSession::setForServer(const wp<RpcServer>& server, const wp<EventListene`
`802`	`802`	`}`
`803`	`803`
`804`	`804`	`void RpcSession::setSessionSpecificRoot(const sp<IBinder>& sessionSpecificRoot) {`
	`805`	`+ LOG_ALWAYS_FATAL_IF(mSessionSpecificRootObject != nullptr,`
	`806`	`+ "Session specific root object already set");`
	`807`	`+ LOG_ALWAYS_FATAL_IF(mForServer != nullptr,`
	`808`	`+ "Session specific root object cannot be set for a server");`
`805`	`809`	`mSessionSpecificRootObject = sessionSpecificRoot;`
`806`	`810`	`}`
`807`	`811`