commit 396634b967be1140fc9fc74cf151e9045367f010
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 27 01:52:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Feb 27 01:52:14 2021 +0000
tree af7d41dee18f9eb34b88aa662126424e3a81e824
parent d26260bff2af406fc3781d2040c183626ca4f42d
parent 0319a9bb1778ce80316044a9b3ecaea5cd554931

Merge "audio: Introduce read PCM from FMQ session functionality" am: 1ab703d2da am: 0319a9bb17

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1589975

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34d3eab4781c1fa79cd996a29ecd69c6b3bc2cd6

drm/1.0/default/CryptoPlugin.cpp

diff --git a/drm/1.0/default/CryptoPlugin.cpp b/drm/1.0/default/CryptoPlugin.cpp
index 2db3607..e6d4e84 100644
--- a/drm/1.0/default/CryptoPlugin.cpp
+++ b/drm/1.0/default/CryptoPlugin.cpp
@@ -124,7 +124,11 @@
             return Void();
         }
 
-        if (source.offset + offset + source.size > sourceBase->getSize()) {
+        size_t totalSize = 0;
+        if (__builtin_add_overflow(source.offset, offset, &totalSize) ||
+            __builtin_add_overflow(totalSize, source.size, &totalSize) ||
+            totalSize > sourceBase->getSize()) {
+            android_errorWriteLog(0x534e4554, "176496160");
             _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");
             return Void();
         }

security/keymint/aidl/vts/performance/Android.bp

diff --git a/security/keymint/aidl/vts/performance/Android.bp b/security/keymint/aidl/vts/performance/Android.bp
index 03240c3..79ed0d5 100644
--- a/security/keymint/aidl/vts/performance/Android.bp
+++ b/security/keymint/aidl/vts/performance/Android.bp
@@ -14,6 +14,15 @@
 // limitations under the License.
 //
 
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "hardware_interfaces_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    default_applicable_licenses: ["hardware_interfaces_license"],
+}
+
 cc_benchmark {
     name: "VtsAidlKeyMintBenchmarkTest",
     defaults: [