commit cbfe7591da10316b21da89de36ca0a0028b3160a
author Chia-I Wu <olv@google.com> Tue May 16 21:38:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 21:38:11 2017 +0000
tree d575066d62b2223fbe56f574b3a31ec7a9707a55
parent 4d9a8d0e2824f426087c652121320d5ed30f8ae8
parent 1b9371b8629a4f1ebba6029095ad544bd93e7c96

Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a am: 0544fa4580 am: 788ff8c16f am: 72c1a6f762 am: 8b99decc86 am: 83f226ba1b am: 2d4959d8eb am: 6a7200333a am: 2c201405ac
am: 1b9371b862

Change-Id: I4e160a36e4264c1959061c98d57ab0c8bf11aea1

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 2f8e637..8481b50 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -27,6 +27,7 @@
 #include <binder/Parcel.h>
 #include <binder/IInterface.h>
 
+#include <gui/BufferQueueDefs.h>
 #include <gui/IGraphicBufferProducer.h>
 #include <gui/IProducerListener.h>
 
@@ -220,8 +221,16 @@
         if (result != NO_ERROR) {
             return result;
         }
+
         *slot = reply.readInt32();
         result = reply.readInt32();
+        if (result == NO_ERROR &&
+                (*slot < 0 || *slot >= BufferQueueDefs::NUM_BUFFER_SLOTS)) {
+            ALOGE("attachBuffer returned invalid slot %d", *slot);
+            android_errorWriteLog(0x534e4554, "37478824");
+            return UNKNOWN_ERROR;
+        }
+
         return result;
     }