openharmony/communication_ipc
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_ipc synced 2024-11-23 07:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge pull request !1351 from jialinbo/master
This commit is contained in:
openharmony_ci 2024-09-13 06:38:03 +00:00 committed by Gitee
commit fd9cc37ed0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 58 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
interfaces/innerkits/ipc_core/include/iremote_broker.h
View File

@ -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;
};

74
ipc/native/src/core/source/iremote_broker.cpp
View File

@ -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()) {
auto it = creators_.find(descriptor);
if (it != creators_.end()) {
creators_.erase(it);
if (descriptor.empty()) {
return;
}
auto it = creators_.find(descriptor);
if (it != creators_.end()) {
creators_.erase(it);
}
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;
}
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);
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

1
ipc/native/src/core/source/process_skeleton.cpp
View File

@ -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;
}