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

Commit e9d5ae1e authored by Jeff Tinker's avatar Jeff Tinker Committed by android-build-merger
Browse files

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

Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 89bec04c am: f797a48b am: 3f05f301
am: 007064a8

* commit '007064a8':
  Fix security vulnerability in ICrypto DO NOT MERGE
parents 9f2e05eb 007064a8

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(