commit b34566440cad5da599fb93b87b37cb6d38168839
author Andy Hung <hunga@google.com> Mon Nov 28 13:50:21 2016 -0800
committer Andy Hung <hunga@google.com> Mon Nov 28 13:52:03 2016 -0800
tree 97bd3a7606f09d6c6f90b009149c3b98a9177d04
parent b54cab90d4bf84745a57232080d72a50c3b731da

Change order of EFFECT_CMD_GET_PARAM command size check

Test: Custom APK
Bug: 33003822
Change-Id: I7801cf73377ec4086df5da6b138ebc9d13067ebc

services/audioflinger/Effects.cpp

diff --git a/services/audioflinger/Effects.cpp b/services/audioflinger/Effects.cpp
index 3a04651..22c1758 100644
--- a/services/audioflinger/Effects.cpp
+++ b/services/audioflinger/Effects.cpp
@@ -599,16 +599,17 @@
         return mStatus;
     }
     if (cmdCode == EFFECT_CMD_GET_PARAM &&
-            (*replySize < sizeof(effect_param_t) ||
-                    ((effect_param_t *)pCmdData)->psize > *replySize - sizeof(effect_param_t))) {
-        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");
+        android_errorWriteLog(0x534e4554, "33003822");
+        return -EINVAL;
+    }
+    if (cmdCode == EFFECT_CMD_GET_PARAM &&
+            (*replySize < sizeof(effect_param_t) ||
+                    ((effect_param_t *)pCmdData)->psize > *replySize - sizeof(effect_param_t))) {
+        android_errorWriteLog(0x534e4554, "29251553");
         return -EINVAL;
     }
     if ((cmdCode == EFFECT_CMD_SET_PARAM