commit 1de7966c72981aebc3c7f9978ab129678ac89258
author Marco Nelissen <marcone@google.com> Tue Apr 26 08:44:09 2016 -0700
committer Marco Nelissen <marcone@google.com> Tue Apr 26 18:42:04 2016 +0000
tree 7804b10b88396694868549a163c92b6b4d9086ac
parent 41e7b1780f106d2eb4304b1f9cf060ce44177cae

Correctly handle dup() failure in Parcel::readNativeHandle

bail out if dup() fails, instead of creating an invalid native_handle_t

Bug: 28395952

Change-Id: Ia1a6198c0f45165b9c6a55a803e5f64d8afa0572

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 0464e93..c383a2d 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1150,7 +1150,13 @@
 
     for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {
         h->data[i] = dup(readFileDescriptor());
-        if (h->data[i] < 0) err = BAD_VALUE;
+        if (h->data[i] < 0) {
+            for (int j = 0; j < i; j++) {
+                close(h->data[j]);
+            }
+            native_handle_delete(h);
+            return 0;
+        }
     }
     err = read(h->data + numFds, sizeof(int)*numInts);
     if (err != NO_ERROR) {