commit 0c8eaaa140a6051b76390ca5584fbcddd1cef259
author Chien-Yu Chen <cychen@google.com> Tue Sep 19 14:13:14 2017 -0700
committer Chien-Yu Chen <cychen@google.com> Wed Sep 20 11:58:11 2017 -0700
tree c5c95249d46441d81e90255d49c9ecabaa0c980a
parent 453d89d973eb1cf52aa2d36945fe67c1040657d0

QCamera3: Protect unregisterBuffer

Lock mMutex when calling unregisterBuffer in HDR+ processing result
callback because processCaptureRequest may access the channel buffer
at the same time.

Test: CTS
Bug: 64117056
Change-Id: I0a745eb039a58daef5c394df80370d031734ef4a

msm8998/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
index ce58665..7b4dcb7 100644
--- a/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/msm8998/QCamera2/HAL3/QCamera3HWI.cpp
@@ -15545,9 +15545,8 @@
             // Return the buffer to camera framework.
             pthread_mutex_lock(&mMutex);
             handleBufferWithLock(frameworkOutputBuffer, result->requestId);
-            pthread_mutex_unlock(&mMutex);
-
             channel->unregisterBuffer(outputBufferDef.get());
+            pthread_mutex_unlock(&mMutex);
         }
     }