commit 805ca7a1f4d6d43a5b192675018791e90c73aa56
author Andrei Homescu <ahomescu@google.com> Fri Dec 09 07:16:23 2022 +0000
committer Andrei Homescu <ahomescu@google.com> Tue Dec 13 07:34:23 2022 +0000
tree 6a4962b75e2df7c99f0c5daaeca5f869879fc22f
parent 7e560fe534e58e67ecd691083083be042c7559cd

libbinder: Handle peer closing connection in Trusty

Fix the code handling incoming messages in RpcTransportTipcTrusty
to return DEAD_OBJECT if the peer closed the connection
instead of OK.

Bug: 230135749
Test: binderRpcTest on Trusty
Change-Id: I0ff50e31bd1823bcb568119887453f34c380c1d8

libs/binder/RpcTransportTipcAndroid.cpp

diff --git a/libs/binder/RpcTransportTipcAndroid.cpp b/libs/binder/RpcTransportTipcAndroid.cpp
index 453279c..8b3ddfb 100644
--- a/libs/binder/RpcTransportTipcAndroid.cpp
+++ b/libs/binder/RpcTransportTipcAndroid.cpp
@@ -63,12 +63,14 @@
         if (pfd.revents & POLLERR) {
             return DEAD_OBJECT;
         }
+        if (pfd.revents & POLLIN) {
+            // Copied from FdTrigger.cpp: Even though POLLHUP may also be set,
+            // treat it as a success condition to ensure data is drained.
+            return OK;
+        }
         if (pfd.revents & POLLHUP) {
             return DEAD_OBJECT;
         }
-        if (pfd.revents & POLLIN) {
-            return OK;
-        }
 
         return WOULD_BLOCK;
     }