From 0234376503ce421c4b871d5d811c541f5094301a Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 30 Aug 2010 16:01:16 -0700 Subject: Don't propagate StrictMode over one-way Binder calls. This was causing stack stitching problems where a one-way call with violations followed by a two-way call without violations was getting the previous one-way call's violation stack stitched on to the second caller's stack. The solution is a little more indirect than I would've liked (preserving the binder's onTransact flags until enforceInterface) but was seemingly necessary to work without changing the AIDL compiler. It should also be sufficiently cheap, since no new calls to thread-local IPCThreadState lookups were required. The additional work is just same-thread getter/setters on the existing IPCThreadState. Change-Id: I4b6db1d445c56e868e6d0d7be3ba6849f4ef23ae --- libs/binder/IPCThreadState.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'libs/binder/IPCThreadState.cpp') diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp index f6582e6aa249..a3e117f453d2 100644 --- a/libs/binder/IPCThreadState.cpp +++ b/libs/binder/IPCThreadState.cpp @@ -377,6 +377,16 @@ int32_t IPCThreadState::getStrictModePolicy() const return mStrictModePolicy; } +void IPCThreadState::setLastTransactionBinderFlags(int32_t flags) +{ + mLastTransactionBinderFlags = flags; +} + +int32_t IPCThreadState::getLastTransactionBinderFlags() const +{ + return mLastTransactionBinderFlags; +} + void IPCThreadState::restoreCallingIdentity(int64_t token) { mCallingUid = (int)(token>>32); @@ -598,8 +608,10 @@ status_t IPCThreadState::clearDeathNotification(int32_t handle, BpBinder* proxy) } IPCThreadState::IPCThreadState() - : mProcess(ProcessState::self()), mMyThreadId(androidGetTid()), - mStrictModePolicy(0) + : mProcess(ProcessState::self()), + mMyThreadId(androidGetTid()), + mStrictModePolicy(0), + mLastTransactionBinderFlags(0) { pthread_setspecific(gTLS, this); clearCaller(); @@ -983,11 +995,11 @@ status_t IPCThreadState::executeCommand(int32_t cmd) } if (tr.target.ptr) { sp b((BBinder*)tr.cookie); - const status_t error = b->transact(tr.code, buffer, &reply, 0); + const status_t error = b->transact(tr.code, buffer, &reply, tr.flags); if (error < NO_ERROR) reply.setError(error); - + } else { - const status_t error = the_context_object->transact(tr.code, buffer, &reply, 0); + const status_t error = the_context_object->transact(tr.code, buffer, &reply, tr.flags); if (error < NO_ERROR) reply.setError(error); } -- cgit v1.2.3-59-g8ed1b