commit 053895d8a58e7ef598111c631d08fca2edf1185b
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:55:45 2019 +0000
tree e54c6f878d08f54b304625fbe75306ad3f49756b
parent 33f089b3b49fe9bffebb496b688f23df35e1ad7a

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 39f04fb..3b90073 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2887,6 +2887,8 @@
     }
 
     {
+        Mutex::Autolock _l(mLock);
+
         if (!EffectsFactoryHalInterface::isNullUuid(&pDesc->uuid)) {
             // if uuid is specified, request effect descriptor
             lStatus = mEffectsFactoryHal->getDescriptor(&pDesc->uuid, &desc);
@@ -2942,6 +2944,8 @@
                 desc = d;
             }
         }
+    }
+    {
 
         // Do not allow auxiliary effects on a session different from 0 (output mix)
         if (sessionId != AUDIO_SESSION_OUTPUT_MIX &&