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

Commit 0696c437 authored by Jeff Tinker's avatar Jeff Tinker Committed by Brint E. Kriebel
Browse files

DO NOT MERGE Part of fix for libmedia OOB write anywhere 

Clarify that decrypt destination is not a pointer for
secure case.

b/23223325

Change-Id: I642dcf790a9eb9e32175f3e0d8f040c82228e3ac
(cherry picked from commit ed555d70)
Ticket: CYNGNOS-985
parent d7340395

media/libmedia/ICrypto.cpp

+3 −3
Original line number Diff line number Diff line
@@ -257,9 +257,9 @@ status_t BnCrypto::onTransact( 
                    subSamples,

                    sizeof(CryptoPlugin::SubSample) * numSubSamples);



            void *dstPtr;

            void *secureBufferId, *dstPtr;

            if (secure) {

                dstPtr = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));

                secureBufferId = reinterpret_cast<void *>(static_cast<uintptr_t>(data.readInt64()));

            } else {

                dstPtr = malloc(totalSize);

            }
@@ -272,7 +272,7 @@ status_t BnCrypto::onTransact( 
                    mode,

                    srcData,

                    subSamples, numSubSamples,

                    dstPtr,

                    secure ? secureBufferId : dstPtr,

                    &errorDetailMsg);



            reply->writeInt32(result);