commit ccd8680538d3bc3b3c0ef201b3511ee065eca12f
author Eric Laurent <elaurent@google.com> Sat Jul 15 00:52:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jul 15 00:52:06 2017 +0000
tree 34afa2ab795ffd73ee304c1a53f83a594d615b5f
parent 4fa1ff8958e29dd89ddce99dfc6d94ea2146481b
parent a5d728cce1d43536c56fffe919df19a897b95665

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am: 125fc63d73
am: a5d728cce1

Change-Id: I82e1af7e7ff4b7dcc7a9b1121893f7514fdbf05d

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index f908d6d..b588685 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -1309,6 +1309,24 @@
     ALOGVV("command(), cmdCode: %d, mHasControl: %d, mEffect: %p",
             cmdCode, mHasControl, mEffect.unsafe_get());
 
+    // reject commands reserved for internal use by audio framework if coming from outside
+    // of audioserver
+    switch(cmdCode) {
+        case EFFECT_CMD_ENABLE:
+        case EFFECT_CMD_DISABLE:
+        case EFFECT_CMD_SET_PARAM:
+        case EFFECT_CMD_SET_PARAM_DEFERRED:
+        case EFFECT_CMD_SET_PARAM_COMMIT:
+        case EFFECT_CMD_GET_PARAM:
+            break;
+        default:
+            if (cmdCode >= EFFECT_CMD_FIRST_PROPRIETARY) {
+                break;
+            }
+            android_errorWriteLog(0x534e4554, "62019992");
+            return BAD_VALUE;
+    }
+
     if (cmdCode == EFFECT_CMD_ENABLE) {
         if (*replySize < sizeof(int)) {
             android_errorWriteLog(0x534e4554, "32095713");