diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-12-10 00:38:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-10 00:38:22 +0000 |
| commit | 89bec04cf83598b1868f3f969c220c3200028e03 (patch) | |
| tree | ddc4b6ec557aa96a5d54d6a9a48ccb240d118d3e /media/libmedia | |
| parent | e6185af491ba38cd6f2b67874bebe3e6bbf65777 (diff) | |
| parent | 22f824feac43d5758f9a70b77f2aca840ba62c3b (diff) | |
| download | frameworks_av-89bec04cf83598b1868f3f969c220c3200028e03.zip frameworks_av-89bec04cf83598b1868f3f969c220c3200028e03.tar.gz frameworks_av-89bec04cf83598b1868f3f969c220c3200028e03.tar.bz2 | |
Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index a398ff7..22f8af7 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -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( |