commit 3f05f30117c9ad8a0956f31431ddd5fbc07fbd99
author Jeff Tinker <jtinker@google.com> Thu Dec 10 00:41:15 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 10 00:41:15 2015 +0000
tree 2880b244f9b1ec44b7d243855b0dc0a0d58df78a
parent 0e7c8849a934b0785adde3fd2ca26cc5d54517ee
parent f797a48b4ceaef56402ecd942ccdebab394daad0

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

* commit 'f797a48b4ceaef56402ecd942ccdebab394daad0':
  Fix security vulnerability in ICrypto DO NOT MERGE

media/libmedia/ICrypto.cpp

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 @@
 
             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(