Release resources when repeating dlopen-dlcose.

When the libbinder.so is dlopen and dlclose many times, we need to delete the pthread_key and munmap the memory mapping. Otherwise, it will crash as the leakage causes the pthread_key or memory mapping surpass their limit. Change-Id: Ice64d4ef685c1f665350286f9e5ddf790beac236 Signed-off-by: zhongjie <[email protected]>
AOKP · Jan 24, 2017 · b83a605 · b83a605
1 parent f18ee65
commit b83a605
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
@@ -330,6 +330,7 @@ void IPCThreadState::shutdown()
             delete st;
             pthread_setspecific(gTLS, NULL);
         }
+        pthread_key_delete(gTLS);
         gHaveTLS = false;
     }
 }

diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp
@@ -366,6 +366,13 @@ ProcessState::ProcessState()
 
 ProcessState::~ProcessState()
 {
+    if (mDriverFD >= 0) {
+        if (mVMStart != MAP_FAILED) {
+            munmap(mVMStart, BINDER_VM_SIZE);
+        }
+        close(mDriverFD);
+    }
+    mDriverFD = -1;
 }
 
 }; // namespace android