sm: fix deadlock semantics surrounding mitm installation

2020-09-07 10:40:43 -07:00
parent fac502aaa3
commit 99b5458539
10 changed files with 62 additions and 3 deletions
--- a/libraries/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
+++ b/libraries/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
@@ -27,6 +27,10 @@ namespace ams::sf::hipc {

        /* Register the query handle. */
        impl::RegisterMitmQueryHandle(query_handle, query_func);
+
+        /* Clear future declarations if any, now that our query handler is present. */
+        R_ABORT_UNLESS(sm::mitm::ClearFutureMitm(service_name));
+
        return ResultSuccess();
    }