commit 95df778f8ace17f001faa0d2840004c33906e970
author Fabien Sanglard <sanglardf@google.com> Tue Nov 29 07:36:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 29 07:36:58 2016 +0000
tree fae99b350a47fc276ed72610a189dbe48c66d197
parent 8f2e06aaf3dd0471ee531c1afbc735aa4221d4f1
parent 97ce922887ee53eae54333c44007948ea40e914b

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
am: 97ce922887

Change-Id: I198eccaf1f86d250088edb48bd5ef3dcb4cebc00

libs/gui/BufferQueueConsumer.cpp

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