!1351 fix: 校验so是否被卸载

Merge pull request !1351 from jialinbo/master

interfaces/innerkits/ipc_core/include/iremote_broker.h

@@ -115,9 +115,10 @@ private:
     BrokerRegistration(BrokerRegistration &&) = delete;
     BrokerRegistration &operator = (const BrokerRegistration &) = delete;
     BrokerRegistration &operator = (BrokerRegistration &&) = delete;
+    std::string GetObjectSoPath(uintptr_t ptr);
     std::mutex creatorMutex_;
     std::unordered_map<std::u16string, Constructor> creators_;
-    std::vector<uintptr_t> objects_;
+    std::unordered_map<uintptr_t, std::string> objects_;
     std::atomic<bool> isUnloading = false;
 };
 

ipc/native/src/core/source/iremote_broker.cpp

@@ -15,6 +15,7 @@
 
 #include "iremote_broker.h"
 
+#include <dlfcn.h>
 #include <utility>
 
 #include "__mutex_base"
@@ -41,10 +42,9 @@ BrokerRegistration::~BrokerRegistration()
 {
     std::lock_guard<std::mutex> lockGuard(creatorMutex_);
     isUnloading = true;
-    for (auto it1 = objects_.begin(); it1 != objects_.end();) {
-        BrokerDelegatorBase *object = reinterpret_cast<BrokerDelegatorBase *>(*it1);
+    for (auto it1 = objects_.begin(); it1 != objects_.end(); it1++) {
+        BrokerDelegatorBase *object = reinterpret_cast<BrokerDelegatorBase *>(it1->first);
         object->isSoUnloaded = true;
-        it1 = objects_.erase(it1);
     }
 }
 
@@ -65,12 +65,28 @@ bool BrokerRegistration::Register(const std::u16string &descriptor, const Constr
     if (it == creators_.end()) {
         ret = creators_.insert({ descriptor, creator }).second;
     }
-    auto it1 = std::find_if(objects_.begin(), objects_.end(), [descriptor](uintptr_t id) {
-        const BrokerDelegatorBase *object = reinterpret_cast<BrokerDelegatorBase *>(id);
-        return object->descriptor_ == descriptor;
-    });
-    if (it1 == objects_.end()) {
-        objects_.push_back(reinterpret_cast<uintptr_t>(object));
+
+    auto iter = objects_.begin();
+    for (; iter != objects_.end();) {
+        std::string soPath = GetObjectSoPath(iter->first);
+        if (soPath.empty() || (soPath != iter->second)) {
+            ZLOGW(LABEL, "path:%{public}s is dlcosed", iter->second.c_str());
+            iter = objects_.erase(iter);
+            continue;
+        }
+        const BrokerDelegatorBase *object = reinterpret_cast<BrokerDelegatorBase *>(iter->first);
+        if (object->descriptor_ == descriptor) {
+            break;
+        }
+        iter++;
+    }
+
+    if (iter == objects_.end()) {
+        std::string soPath = GetObjectSoPath(reinterpret_cast<uintptr_t>(object));
+        if (soPath.empty()) {
+            return false;
+        }
+        objects_.insert(std::make_pair(reinterpret_cast<uintptr_t>(object), soPath));
     }
     return ret;
 }
@@ -82,18 +98,27 @@ void BrokerRegistration::Unregister(const std::u16string &descriptor)
         ZLOGE(LABEL, "BrokerRegistration is Unloading");
         return;
     }
-    if (!descriptor.empty()) {
+    if (descriptor.empty()) {
+        return;
+    }
     auto it = creators_.find(descriptor);
     if (it != creators_.end()) {
         creators_.erase(it);
     }
-        auto it1 = std::find_if(objects_.begin(), objects_.end(), [descriptor](uintptr_t id) {
-            const BrokerDelegatorBase *object = reinterpret_cast<BrokerDelegatorBase *>(id);
-            return object->descriptor_ == descriptor;
-        });
-        if (it1 != objects_.end()) {
-            objects_.erase(it1);
+
+    for (auto iter = objects_.begin(); iter != objects_.end();) {
+        std::string soPath = GetObjectSoPath(iter->first);
+        if (soPath.empty() || (soPath != iter->second)) {
+            ZLOGW(LABEL, "path:%{public}s is dlcosed", iter->second.c_str());
+            iter = objects_.erase(iter);
+            continue;
         }
+        const BrokerDelegatorBase *object = reinterpret_cast<BrokerDelegatorBase *>(iter->first);
+        if (object->descriptor_ == descriptor) {
+            objects_.erase(iter);
+            return;
+        }
+        iter++;
     }
 }
 
@@ -114,4 +139,15 @@ sptr<IRemoteBroker> BrokerRegistration::NewInstance(const std::u16string &descri
     }
     return broker;
 }
+
+std::string BrokerRegistration::GetObjectSoPath(uintptr_t ptr)
+{
+    Dl_info info;
+    int32_t ret = dladdr(reinterpret_cast<void *>(ptr), &info);
+    if ((ret == 0) || (info.dli_fname == nullptr)) {
+        ZLOGW(LABEL, "dladdr failed ret:%{public}d", ret);
+        return "";
+    }
+    return info.dli_fname;
+}
 } // namespace OHOS

ipc/native/src/core/source/process_skeleton.cpp

@@ -245,6 +245,7 @@ bool ProcessSkeleton::AttachValidObject(IRemoteObject *object, bool isValid)
     CHECK_INSTANCE_EXIT_WITH_RETVAL(exitFlag_, false);
     std::unique_lock<std::shared_mutex> lockGuard(validObjectMutex_);
     auto result = validObjectRecord_.insert_or_assign(object, isValid);
+    ZLOGD(LOG_LABEL, "%{public}u inserted:%{public}d", ConvertAddr(object), result.second);
     return result.second;
 }