commit a13a22649b27199a3a368da3f5f3c99c6af4c398
author Amith Yamasani <yamasani@google.com> Mon Jun 13 18:37:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 13 18:37:40 2016 +0000
tree 3efdf228619f8063c7d580c9766b5e3550c0318b
parent 324b700b4b0669683efff3d696324dc0d4e24ec5
parent 6b0b06348d4cc8eb0087d95826dbeba9a72565d8

Merge "Fixed file descriptor leak in IMemory" into nyc-dev

libs/binder/IMemory.cpp

diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp
index fb8d620..5f345cf 100644
--- a/libs/binder/IMemory.cpp
+++ b/libs/binder/IMemory.cpp
@@ -312,17 +312,17 @@
                 IInterface::asBinder(this).get(),
                 parcel_fd, size, err, strerror(-err));
 
-        int fd = dup( parcel_fd );
-        ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%zd, err=%d (%s)",
-                parcel_fd, size, err, strerror(errno));
-
-        int access = PROT_READ;
-        if (!(flags & READ_ONLY)) {
-            access |= PROT_WRITE;
-        }
-
         Mutex::Autolock _l(mLock);
         if (mHeapId == -1) {
+            int fd = dup( parcel_fd );
+            ALOGE_IF(fd==-1, "cannot dup fd=%d, size=%zd, err=%d (%s)",
+                    parcel_fd, size, err, strerror(errno));
+
+            int access = PROT_READ;
+            if (!(flags & READ_ONLY)) {
+                access |= PROT_WRITE;
+            }
+
             mRealHeap = true;
             mBase = mmap(0, size, access, MAP_SHARED, fd, offset);
             if (mBase == MAP_FAILED) {