commit 788ff8c16f4157c21aac480a78dd9699bad0b1e3
author Chia-I Wu <olv@google.com> Tue May 16 20:59:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 20:59:04 2017 +0000
tree 519e5e6597add00201e77270689f1eb02f1b750d
parent 787aa48f415cd5b856bd60ce8fa005f1928e6ac6
parent 0544fa45802436d0cf20ea6183905f0a368635fc

Merge "libgui: check for invalid slot in attachBuffer" into lmp-dev am: af33c978c8 am: 396cc342a7 am: 91a7e47a53 am: 6a9b41dc22 am: 1f8b90126a
am: 0544fa4580

Change-Id: Id6d055a523eed1f96e1373d4f3fede43551a8abe

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index c3c6235..51eedab 100644
--- a/libs/gui/IGraphicBufferProducer.cpp
+++ b/libs/gui/IGraphicBufferProducer.cpp
@@ -26,6 +26,7 @@
 #include <binder/Parcel.h>
 #include <binder/IInterface.h>
 
+#include <gui/BufferQueueDefs.h>
 #include <gui/IGraphicBufferProducer.h>
 #include <gui/IProducerListener.h>
 
@@ -170,8 +171,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;
     }