Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d29e392 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick Committed by Android (Google) Code Review
Browse files

Merge "Don't propagate StrictMode over one-way Binder calls." into gingerbread

parents 59f189a5 5273603e

include/binder/IPCThreadState.h

+5 −1
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ public: 
            void                setStrictModePolicy(int32_t policy);

            int32_t             getStrictModePolicy() const;



            void                setLastTransactionBinderFlags(int32_t flags);

            int32_t             getLastTransactionBinderFlags() const;



            int64_t             clearCallingIdentity();

            void                restoreCallingIdentity(int64_t token);
@@ -113,6 +116,7 @@ private: 
            pid_t               mCallingPid;

            uid_t               mCallingUid;

            int32_t             mStrictModePolicy;

            int32_t             mLastTransactionBinderFlags;

};



}; // namespace android

libs/binder/IPCThreadState.cpp

+17 −5
Original line number Diff line number Diff line
@@ -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<BBinder> 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);

            }

libs/binder/Parcel.cpp

+10 −1
Original line number Diff line number Diff line
@@ -464,7 +464,16 @@ bool Parcel::enforceInterface(const String16& interface, 
    if (threadState == NULL) {

        threadState = IPCThreadState::self();

    }

    if ((threadState->getLastTransactionBinderFlags() &

         IBinder::FLAG_ONEWAY) != 0) {

      // For one-way calls, the callee is running entirely

      // disconnected from the caller, so disable StrictMode entirely.

      // Not only does disk/network usage not impact the caller, but

      // there's no way to commuicate back any violations anyway.

      threadState->setStrictModePolicy(0);

    } else {

      threadState->setStrictModePolicy(strictPolicy);

    }

    const String16 str(readString16());

    if (str == interface) {

        return true;