commit a95c6afecbb613549cb8251b2b2d61f047f7b2bd
author Andy Hung <hunga@google.com> Mon May 16 21:54:17 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 16 21:54:17 2016 +0000
tree d016e6ae68111687fbcb1555db11360e51cda955
parent 21c641d43039bfdf9fac0ecd30172d9117b84e94
parent e29e934c6e372af8ad21b3911af67406913e1fa4

Merge "DO NOT MERGE Fix AudioEffect reply overflow" into mnc-dev
am: e29e934c6e

* commit 'e29e934c6e372af8ad21b3911af67406913e1fa4':
  DO NOT MERGE Fix AudioEffect reply overflow

Change-Id: I406cee367e0983edf94c328af7e0661e51074bd4

post_proc/bundle.c

diff --git a/post_proc/bundle.c b/post_proc/bundle.c
index a6b0727..df327ab 100644
--- a/post_proc/bundle.c
+++ b/post_proc/bundle.c
@@ -621,8 +621,9 @@
         if (pCmdData == NULL ||
             cmdSize < (int)(sizeof(effect_param_t) + sizeof(uint32_t)) ||
             pReplyData == NULL ||
-            *replySize < (int)(sizeof(effect_param_t) + sizeof(uint32_t) +
-                               sizeof(uint16_t))) {
+            *replySize < (int)(sizeof(effect_param_t) + sizeof(uint32_t) + sizeof(uint16_t)) ||
+            // constrain memcpy below
+            ((effect_param_t *)pCmdData)->psize > *replySize - sizeof(effect_param_t)) {
             status = -EINVAL;
             ALOGV("EFFECT_CMD_GET_PARAM invalid command cmdSize %d *replySize %d",
                   cmdSize, *replySize);

voice_processing/voice_processing.c

diff --git a/voice_processing/voice_processing.c b/voice_processing/voice_processing.c
index b3f97c6..7d2b592 100644
--- a/voice_processing/voice_processing.c
+++ b/voice_processing/voice_processing.c
@@ -560,7 +560,9 @@
             if (pCmdData == NULL ||
                     cmdSize < (int)sizeof(effect_param_t) ||
                     pReplyData == NULL ||
-                    *replySize < (int)sizeof(effect_param_t)) {
+                    *replySize < (int)sizeof(effect_param_t) ||
+                    // constrain memcpy below
+                    ((effect_param_t *)pCmdData)->psize > *replySize - sizeof(effect_param_t)) {
                 ALOGV("fx_command() EFFECT_CMD_GET_PARAM invalid args");
                 return -EINVAL;
             }