commit 5f53663116f44189664d6dbdd176681b63901ac4
author Ytai Ben-tsvi <ytai@google.com> Thu Feb 04 18:35:53 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 04 18:35:53 2021 +0000
tree 1bb63a8c661c4e6f15636b1c6930d06e11576cee
parent d9e39342af2fc40ba44ec78e5f5986545eef2b76
parent 6300039f3e0515cf17bed2419ed764e5498d3e61

Merge "Deprecate old soundtrigger HAL versions" into sc-dev

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();
         }

radio/1.6/types.hal

diff --git a/radio/1.6/types.hal b/radio/1.6/types.hal
index a6de033..c02a43f 100644
--- a/radio/1.6/types.hal
+++ b/radio/1.6/types.hal
@@ -744,6 +744,14 @@
              */
             NrVopsInfo nrVopsInfo;
         } ngranInfo;
+
+        struct GeranRegistrationInfo {
+            /**
+             * True if the dual transfer mode is supported.
+             * Refer to 3GPP TS 44.108 section 3.4.25.3
+             */
+            bool dtmSupported;
+        } geranInfo;
     } accessTechnologySpecificInfo;
 };