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

Commit 89bec04c authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev

parents e6185af4 22f824fe

media/libmedia/ICrypto.cpp

+3 −1
Original line number Diff line number Diff line
@@ -321,7 +321,9 @@ status_t BnCrypto::onTransact( 


            if (overflow || sumSubsampleSizes != totalSize) {

                result = -EINVAL;

            } else if (offset + totalSize > sharedBuffer->size()) {

            } else if (totalSize > sharedBuffer->size()) {

                result = -EINVAL;

            } else if ((size_t)offset > sharedBuffer->size() - totalSize) {

                result = -EINVAL;

            } else {

                result = decrypt(