commit 72c1a6f7621a1325dfa6f08d7353ebd089344583
author Chia-I Wu <olv@google.com> Tue May 16 21:02:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 16 21:02:42 2017 +0000
tree fb981982cd17eeae643ce72226d77ead114e1a8b
parent f69675e5c26217602fc794e46e8e0c7b8af15eea
parent 788ff8c16f4157c21aac480a78dd9699bad0b1e3

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

Change-Id: I5623d15da983b9277ab968d63b537ce396ad007c

libs/gui/IGraphicBufferProducer.cpp

diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp
index 7d7d09d..5b7068a 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>
 
@@ -190,8 +191,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;
     }