summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-06-08 06:55:37 +0200
committerbunnei <bunneidev@gmail.com>2021-06-08 06:55:37 +0200
commit08d798b6fe8b09f28c0302b52c3b832b786d1b8a (patch)
tree925a674b4f2f7a038aade0dc9e8eb218531b13c8
parenthle: kernel: Remove service thread manager and use weak_ptr. (diff)
downloadyuzu-08d798b6fe8b09f28c0302b52c3b832b786d1b8a.tar
yuzu-08d798b6fe8b09f28c0302b52c3b832b786d1b8a.tar.gz
yuzu-08d798b6fe8b09f28c0302b52c3b832b786d1b8a.tar.bz2
yuzu-08d798b6fe8b09f28c0302b52c3b832b786d1b8a.tar.lz
yuzu-08d798b6fe8b09f28c0302b52c3b832b786d1b8a.tar.xz
yuzu-08d798b6fe8b09f28c0302b52c3b832b786d1b8a.tar.zst
yuzu-08d798b6fe8b09f28c0302b52c3b832b786d1b8a.zip
-rw-r--r--src/core/hle/kernel/hle_ipc.cpp15
-rw-r--r--src/core/hle/kernel/hle_ipc.h3
-rw-r--r--src/core/hle/kernel/k_server_session.cpp13
3 files changed, 26 insertions, 5 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 260af87e5..45aced99f 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -41,6 +41,21 @@ SessionRequestManager::SessionRequestManager(KernelCore& kernel_) : kernel{kerne
SessionRequestManager::~SessionRequestManager() = default;
+bool SessionRequestManager::HasSessionRequestHandler(const HLERequestContext& context) const {
+ if (IsDomain() && context.HasDomainMessageHeader()) {
+ const auto& message_header = context.GetDomainMessageHeader();
+ const auto object_id = message_header.object_id;
+
+ if (object_id > DomainHandlerCount()) {
+ LOG_CRITICAL(IPC, "object_id {} is too big!", object_id);
+ return false;
+ }
+ return DomainHandler(object_id - 1) != nullptr;
+ } else {
+ return session_handler != nullptr;
+ }
+}
+
void SessionRequestHandler::ClientConnected(KServerSession* session) {
session->SetSessionHandler(shared_from_this());
}
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 159565203..a61870f8b 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -156,6 +156,8 @@ public:
return session_handler->GetServiceThread();
}
+ bool HasSessionRequestHandler(const HLERequestContext& context) const;
+
private:
bool is_domain{};
SessionRequestHandlerPtr session_handler;
@@ -163,7 +165,6 @@ private:
private:
KernelCore& kernel;
- std::weak_ptr<ServiceThread> service_thread;
};
/**
diff --git a/src/core/hle/kernel/k_server_session.cpp b/src/core/hle/kernel/k_server_session.cpp
index 61213c20e..dd62706a8 100644
--- a/src/core/hle/kernel/k_server_session.cpp
+++ b/src/core/hle/kernel/k_server_session.cpp
@@ -119,11 +119,16 @@ ResultCode KServerSession::QueueSyncRequest(KThread* thread, Core::Memory::Memor
context->PopulateFromIncomingCommandBuffer(kernel.CurrentProcess()->GetHandleTable(), cmd_buf);
- if (auto strong_ptr = manager->GetServiceThread().lock()) {
- strong_ptr->QueueSyncRequest(*parent, std::move(context));
- return ResultSuccess;
+ // Ensure we have a session request handler
+ if (manager->HasSessionRequestHandler(*context)) {
+ if (auto strong_ptr = manager->GetServiceThread().lock()) {
+ strong_ptr->QueueSyncRequest(*parent, std::move(context));
+ return ResultSuccess;
+ } else {
+ ASSERT_MSG(false, "strong_ptr is nullptr!");
+ }
} else {
- ASSERT_MSG(false, "strong_ptr was nullptr!");
+ ASSERT_MSG(false, "handler is invalid!");
}
return ResultSuccess;