commit 49d89e9df80bbcb9629579086df99c01d75d6851
author Andy Hung <hunga@google.com> Thu Jan 10 13:27:31 2019 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 16 18:56:03 2019 +0000
tree 43fb0949f7acbd6c43bfdd722a9b84352ca39769
parent f6a40939fb77aace764df0cde4f354deae6b9883

AudioFlinger: put effect desc lookup under mutex for createEffect

Test: native poc
Bug: 122309228
Change-Id: I48333c69f5c1b1bf1b98f57eb813ec39e074f3a7
Merged-In: I9d339a7d6d81161065e1adaf427dd2d3430436c2
(cherry picked from commit a41770b682117fdfc20236fbc45d975099f9147a)

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index bdd39c6..687b5a6 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3001,6 +3001,8 @@
     }
 
     {
+        Mutex::Autolock _l(mLock);
+
         if (!EffectsFactoryHalInterface::isNullUuid(&pDesc->uuid)) {
             // if uuid is specified, request effect descriptor
             lStatus = mEffectsFactoryHal->getDescriptor(&pDesc->uuid, &desc);
@@ -3056,6 +3058,8 @@
                 desc = d;
             }
         }
+    }
+    {
 
         // Do not allow auxiliary effects on a session different from 0 (output mix)
         if (sessionId != AUDIO_SESSION_OUTPUT_MIX &&