commit 5662efe76bfa566c27bf622722c9831be410d8b5
author Andy Hung <hunga@google.com> Thu Nov 10 19:58:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 10 19:58:58 2016 +0000
tree fa41ce4450bafeb795406deaf9543db45cd0ed75
parent a083418542f7d59c171eb513068fdb2205a9baf5
parent 134e20847763b64ae4afb968f55801c0cfb26c5f

Effects: Check get parameter command size am: 3d34cc76e3 am: 59920bf785 am: 14d87911d7 am: 79a088a065 am: 58e5681c96 am: f0f864a1e4
am: 134e208477

Change-Id: Icb77516db563dc75d8405eccbb5012ebb128d775

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index f87b8f57..321099a 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -571,6 +571,13 @@
         android_errorWriteLog(0x534e4554, "29251553");
         return -EINVAL;
     }
+    if (cmdCode == EFFECT_CMD_GET_PARAM &&
+            (sizeof(effect_param_t) > cmdSize ||
+                    ((effect_param_t *)pCmdData)->psize > cmdSize
+                                                          - sizeof(effect_param_t))) {
+        android_errorWriteLog(0x534e4554, "32438594");
+        return -EINVAL;
+    }
     if ((cmdCode == EFFECT_CMD_SET_PARAM
             || cmdCode == EFFECT_CMD_SET_PARAM_DEFERRED) &&  // DEFERRED not generally used
         (sizeof(effect_param_t) > cmdSize