commit 97ce922887ee53eae54333c44007948ea40e914b
author Fabien Sanglard <sanglardf@google.com> Tue Nov 15 01:44:23 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 15 01:44:23 2016 +0000
tree abd89472095b29db5b7e883f3b788f49486a66f2
parent 0646227ad2e6c1aaddc40fc871554b51a953fa29
parent ce40ad244154c875f1e1fd3cdce2c1440fe8fb6a

Fix SF security vulnerability: 32660278 am: 2d8a2432e0 am: e5c91fe2e2 am: 9d14ab5409 am: 275b2347ef am: aff7827b4f am: c8684d517a am: 57dbf1c224 am: b17adaa85f am: c261a17e51
am: ce40ad2441

Change-Id: Ia569c1b5841cf75626ae29e656688a405709ad79

libs/gui/BufferQueueConsumer.cpp

diff --git a/libs/gui/BufferQueueConsumer.cpp b/libs/gui/BufferQueueConsumer.cpp
index ca2a374..73d2042 100644
--- a/libs/gui/BufferQueueConsumer.cpp
+++ b/libs/gui/BufferQueueConsumer.cpp
@@ -715,6 +715,7 @@
 }
 
 sp<NativeHandle> BufferQueueConsumer::getSidebandStream() const {
+    Mutex::Autolock lock(mCore->mMutex);
     return mCore->mSidebandStream;
 }