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

Commit 1f9c0430 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: Fix out-of-bounds abort in RpcServer" am: 09ba064c am:... 

Merge "libbinder: Fix out-of-bounds abort in RpcServer" am: 09ba064c am: e43e5bea am: 80495c92

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2146845



Change-Id: Icc44ac63df43c23e33540e863736aa1fddadb11c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a6b7a85 80495c92

libs/binder/RpcServer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -421,7 +421,9 @@ void RpcServer::establishConnection(sp<RpcServer>&& server, base::unique_fd clie 
            session->setMaxIncomingThreads(server->mMaxThreads);

            if (!session->setProtocolVersion(protocolVersion)) return;



            if (server->mSupportedFileDescriptorTransportModes.test(

            if (header.fileDescriptorTransportMode <

                        server->mSupportedFileDescriptorTransportModes.size() &&

                server->mSupportedFileDescriptorTransportModes.test(

                        header.fileDescriptorTransportMode)) {

                session->setFileDescriptorTransportMode(

                        static_cast<RpcSession::FileDescriptorTransportMode>(