commit dd906d7da0595902bbf1b381c84fd9a8a4816973
author Dimitry Ivanov <dimitry@google.com> Wed Apr 13 11:46:59 2016 -0700
committer Dimitry Ivanov <dimitry@google.com> Wed Apr 13 12:41:41 2016 -0700
tree fe969282de6f716637055f5d5cd9c162205dbd81
parent 868b6fa4261a1d09e016cab6f43dada0273694b8

linker: unload RTLD_NODELETE libraries when loading fails

Linker was not unloading libraries marked with RTLD_NODELETE
even when there was a error on load. For example when one of
dt_needed libraries was not found.

Bug: http://b/27911891
Change-Id: Ibc0bf110aa41fbfdc9f327ad8c364f2e3600af71
(cherry picked from commit 79abce42146b27d523f309e0a1bc9f50175191cb)

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 855b32b..bda713e 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -3220,7 +3220,7 @@
 }
 
 bool soinfo::can_unload() const {
-  return (get_rtld_flags() & (RTLD_NODELETE | RTLD_GLOBAL)) == 0;
+  return !is_linked() || ((get_rtld_flags() & (RTLD_NODELETE | RTLD_GLOBAL)) == 0);
 }
 
 bool soinfo::is_linked() const {