commit 2034effbb3d79bc89e3dcde94fee92ece56c8206
author Steven Moreland <smoreland@google.com> Wed Oct 13 11:24:35 2021 -0700
committer Steven Moreland <smoreland@google.com> Wed Oct 13 18:47:43 2021 +0000
tree 4284dd07e0db4bf0061ff680dc72498601bb0e7a
parent d8b3d5f05695af40955c2d3e1d40c51db437f977

libbinder: Parcel::appendFrom better format check

(thanks jooyung@ for the catch here)

Even if we have two RPC parcels, they need to both be for the RPC
session. Otherwise, they might be at different versions (and we don't
really have a way to reconcile this).

Bug: 182939048
Test: binderRpcTest
Change-Id: I5180ebc681ccc79bf05a3fc0900a9b240e793a66

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index d68c6ff..8267702 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -690,13 +690,21 @@
 }
 
 TEST_P(BinderRpc, AppendSeparateFormats) {
-    auto proc = createRpcTestSocketServerProcess({});
+    auto proc1 = createRpcTestSocketServerProcess({});
+    auto proc2 = createRpcTestSocketServerProcess({});
+
+    Parcel pRaw;
 
     Parcel p1;
-    p1.markForBinder(proc.rootBinder);
+    p1.markForBinder(proc1.rootBinder);
     p1.writeInt32(3);
 
+    EXPECT_EQ(BAD_TYPE, p1.appendFrom(&pRaw, 0, p1.dataSize()));
+    EXPECT_EQ(BAD_TYPE, pRaw.appendFrom(&p1, 0, p1.dataSize()));
+
     Parcel p2;
+    p2.markForBinder(proc2.rootBinder);
+    p2.writeInt32(7);
 
     EXPECT_EQ(BAD_TYPE, p1.appendFrom(&p2, 0, p2.dataSize()));
     EXPECT_EQ(BAD_TYPE, p2.appendFrom(&p1, 0, p1.dataSize()));