commit 26214cfbaabc4d1c41d7993789e38cda58da9d3e
author Mikhail Naganov <mnaganov@google.com> Tue Oct 31 19:42:24 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 19:42:24 2017 +0000
tree 373c80713a66a8f89006e5759b4e5c9ea9451449
parent 80cae0a651a036cd70b82e8c6185585e774ebf18
parent 62e3e5902967bf5a8c8c469160498063264fc67d

Merge "Add EFFECT_CMD_SET_PARAM parameter checking to Preset Reverb" into lmp-mr1-dev am: 31b0c9cb33 am: be30bb2645 am: e2d671ce19 am: 8aa73cce69 am: 3785a50ef4 am: a060ca58ff am: dee287e40c am: 9dc85bf51e am: 59e93ab3ab am: 3b564f6e42
am: 62e3e59029

Change-Id: I194f466e05eeccdf322042e48c6d4fd486d41cc6

media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp

diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
index 6d7d4cd..ec6243a 100644
--- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
+++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
@@ -1767,6 +1767,10 @@
         if (param != REVERB_PARAM_PRESET) {
             return -EINVAL;
         }
+        if (vsize < (int)sizeof(uint16_t)) {
+            android_errorWriteLog(0x534e4554, "67647856");
+            return -EINVAL;
+        }
 
         uint16_t preset = *(uint16_t *)pValue;
         ALOGV("set REVERB_PARAM_PRESET, preset %d", preset);