commit a69abc999b8946e474b8d996584ca66c5141bccf
author Steven Moreland <smoreland@google.com> Thu Nov 15 05:43:31 2018 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 15 05:43:31 2018 -0800
tree 06332f062f5067e4eeed74f1e29d1d8c9d0820d1
parent 8259ea2bf57a1fb7c12a79e9711f1d0ac2e5febb
parent ba4216a1b1b49348ca1abc468df9cbb067b90cb3

Merge "libbinder: detach ParcelFileDescriptor comm" am: a6d2152f14 am: ae209feb97
am: ba4216a1b1

Change-Id: I537ac5950faaf330c903ad1435f85904b0d8e48d

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index bc1a71c..532f7f1 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -2245,8 +2245,30 @@
     int32_t hasComm = readInt32();
     int fd = readFileDescriptor();
     if (hasComm != 0) {
-        // skip
-        readFileDescriptor();
+        // detach (owned by the binder driver)
+        int comm = readFileDescriptor();
+
+        // warning: this must be kept in sync with:
+        // frameworks/base/core/java/android/os/ParcelFileDescriptor.java
+        enum ParcelFileDescriptorStatus {
+            DETACHED = 2,
+        };
+
+#if BYTE_ORDER == BIG_ENDIAN
+        const int32_t message = ParcelFileDescriptorStatus::DETACHED;
+#endif
+#if BYTE_ORDER == LITTLE_ENDIAN
+        const int32_t message = __builtin_bswap32(ParcelFileDescriptorStatus::DETACHED);
+#endif
+
+        ssize_t written = TEMP_FAILURE_RETRY(
+            ::write(comm, &message, sizeof(message)));
+
+        if (written == -1 || written != sizeof(message)) {
+            ALOGW("Failed to detach ParcelFileDescriptor written: %zd err: %s",
+                written, strerror(errno));
+            return BAD_TYPE;
+        }
     }
     return fd;
 }