mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-29 23:32:23 +00:00
Code Issues Releases Activity

sm: use AutoHandles

Browse source
This commit is contained in:
Michael Scire 2019-06-20 23:51:15 -07:00
parent 2357bc70a7
commit d986ffa153
2 changed files with 40 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
stratosphere/libstratosphere

@ -1 +1 @@
Subproject commit 4ccee4257763373c8e8dd5453246a592482f9a86 Subproject commit 0c26276b21e4cf0f7a0665c0280b3888ebfbd1af

91
stratosphere/sm/source/sm_service_manager.cpp
View file

@ -48,7 +48,7 @@ namespace sts::sm {
struct ServiceInfo { struct ServiceInfo {
ServiceName name; ServiceName name;
u64 owner_pid; u64 owner_pid;
Handle port_h; AutoHandle port_h;
/* Debug. */ /* Debug. */
u64 max_sessions; u64 max_sessions;
@ -56,13 +56,13 @@ namespace sts::sm {
/* Mitm Extension. */ /* Mitm Extension. */
u64 mitm_pid; u64 mitm_pid;
Handle mitm_port_h; AutoHandle mitm_port_h;
Handle mitm_query_h; AutoHandle mitm_query_h;
/* Acknowledgement members. */ /* Acknowledgement members. */
bool mitm_waiting_ack; bool mitm_waiting_ack;
u64 mitm_waiting_ack_pid; u64 mitm_waiting_ack_pid;
Handle mitm_fwd_sess_h; AutoHandle mitm_fwd_sess_h;
ServiceInfo() { ServiceInfo() {
this->Free(); this->Free();
@ -70,52 +70,36 @@ namespace sts::sm {
void Free() { void Free() {
/* Close any open handles. */ /* Close any open handles. */
if (this->port_h != INVALID_HANDLE) { this->port_h.Clear();
svcCloseHandle(this->port_h); this->mitm_port_h.Clear();
} this->mitm_query_h.Clear();
if (this->mitm_port_h != INVALID_HANDLE) { this->mitm_fwd_sess_h.Clear();
svcCloseHandle(this->mitm_port_h);
}
if (this->mitm_query_h != INVALID_HANDLE) {
svcCloseHandle(this->mitm_query_h);
}
/* Reset all members. */ /* Reset all other members. */
this->name = InvalidServiceName; this->name = InvalidServiceName;
this->owner_pid = InvalidProcessId; this->owner_pid = InvalidProcessId;
this->port_h = INVALID_HANDLE;
this->max_sessions = 0; this->max_sessions = 0;
this->is_light = false; this->is_light = false;
this->mitm_pid = InvalidProcessId; this->mitm_pid = InvalidProcessId;
this->mitm_port_h = INVALID_HANDLE;
this->mitm_query_h = INVALID_HANDLE;
this->mitm_waiting_ack = false; this->mitm_waiting_ack = false;
this->mitm_waiting_ack_pid = InvalidProcessId; this->mitm_waiting_ack_pid = InvalidProcessId;
this->mitm_fwd_sess_h = INVALID_HANDLE;
} }
void FreeMitm() { void FreeMitm() {
/* Close mitm handles. */ /* Close mitm handles. */
if (this->mitm_port_h != INVALID_HANDLE) { this->mitm_port_h.Clear();
svcCloseHandle(this->mitm_port_h); this->mitm_query_h.Clear();
}
if (this->mitm_query_h != INVALID_HANDLE) {
svcCloseHandle(this->mitm_query_h);
}
/* Reset mitm members. */ /* Reset mitm members. */
this->mitm_pid = InvalidProcessId; this->mitm_pid = InvalidProcessId;
this->mitm_port_h = INVALID_HANDLE;
this->mitm_query_h = INVALID_HANDLE;
} }
void AcknowledgeMitmSession(u64 *out_pid, Handle *out_hnd) { void AcknowledgeMitmSession(u64 *out_pid, Handle *out_hnd) {
/* Copy to output. */ /* Copy to output. */
*out_pid = this->mitm_waiting_ack_pid; *out_pid = this->mitm_waiting_ack_pid;
*out_hnd = this->mitm_fwd_sess_h; *out_hnd = this->mitm_fwd_sess_h.Move();
this->mitm_waiting_ack = false; this->mitm_waiting_ack = false;
this->mitm_waiting_ack_pid = InvalidProcessId; this->mitm_waiting_ack_pid = InvalidProcessId;
this->mitm_fwd_sess_h = INVALID_HANDLE;
} }
}; };
@ -340,7 +324,7 @@ namespace sts::sm {
info->magic = SFCI_MAGIC; info->magic = SFCI_MAGIC;
info->cmd_id = 65000; info->cmd_id = 65000;
info->pid = pid; info->pid = pid;
R_TRY(ipcDispatch(service_info->mitm_query_h)); R_TRY(ipcDispatch(service_info->mitm_query_h.Get()));
} }
/* Parse response to see if we should mitm. */ /* Parse response to see if we should mitm. */
@ -360,15 +344,17 @@ namespace sts::sm {
/* If we shouldn't mitm, give normal session. */ /* If we shouldn't mitm, give normal session. */
if (!should_mitm) { if (!should_mitm) {
return svcConnectToPort(out, service_info->port_h); return svcConnectToPort(out, service_info->port_h.Get());
} }
/* Create both handles. If the second fails, close the first to prevent leak. */ /* Create both handles. */
R_TRY(svcConnectToPort(&service_info->mitm_fwd_sess_h, service_info->port_h)); {
R_TRY_CLEANUP(svcConnectToPort(out, service_info->mitm_port_h), { AutoHandle fwd_hnd, hnd;
svcCloseHandle(service_info->mitm_fwd_sess_h); R_TRY(svcConnectToPort(fwd_hnd.GetPointer(), service_info->port_h.Get()));
service_info->mitm_fwd_sess_h = 0; R_TRY(svcConnectToPort(hnd.GetPointer(), service_info->mitm_port_h.Get()));
}); service_info->mitm_fwd_sess_h = std::move(fwd_hnd);
*out = hnd.Move();
}
service_info->mitm_waiting_ack_pid = pid; service_info->mitm_waiting_ack_pid = pid;
service_info->mitm_waiting_ack = true; service_info->mitm_waiting_ack = true;
@ -382,7 +368,7 @@ namespace sts::sm {
/* If not mitm'd or mitm service is requesting, get normal session. */ /* If not mitm'd or mitm service is requesting, get normal session. */
if (!IsValidProcessId(service_info->mitm_pid) || service_info->mitm_pid == pid) { if (!IsValidProcessId(service_info->mitm_pid) || service_info->mitm_pid == pid) {
return svcConnectToPort(out, service_info->port_h); return svcConnectToPort(out, service_info->port_h.Get());
} }
/* We're mitm'd. Assert, because mitm service host dead is an error state. */ /* We're mitm'd. Assert, because mitm service host dead is an error state. */
@ -413,8 +399,8 @@ namespace sts::sm {
} }
/* Create the new service. */ /* Create the new service. */
*out = 0; *out = INVALID_HANDLE;
R_TRY(svcCreatePort(out, &free_service->port_h, max_sessions, is_light, free_service->name.name)); R_TRY(svcCreatePort(out, free_service->port_h.GetPointerAndClear(), max_sessions, is_light, free_service->name.name));
/* Save info. */ /* Save info. */
free_service->name = service; free_service->name = service;
@ -482,7 +468,7 @@ namespace sts::sm {
return ResultSmNotAllowed; return ResultSmNotAllowed;
} }
/* Check that the process is registered and allowed to register the service. */ /* Check that the process is registered and allowed to get the service. */
if (!IsInitialProcess(pid)) { if (!IsInitialProcess(pid)) {
ProcessInfo *proc = GetProcessInfo(pid); ProcessInfo *proc = GetProcessInfo(pid);
if (proc == nullptr) { if (proc == nullptr) {
@ -605,20 +591,19 @@ namespace sts::sm {
*out_query = INVALID_HANDLE; *out_query = INVALID_HANDLE;
/* Create mitm handles. */ /* Create mitm handles. */
Handle hnd = 0; {
Handle qry_hnd = 0; AutoHandle hnd, port_hnd, qry_hnd, mitm_qry_hnd;
u64 x = 0; u64 x = 0;
R_TRY(svcCreatePort(&hnd, &service_info->mitm_port_h, service_info->max_sessions, service_info->is_light, reinterpret_cast<char *>(&x))); R_TRY(svcCreatePort(hnd.GetPointer(), port_hnd.GetPointer(), service_info->max_sessions, service_info->is_light, reinterpret_cast<char *>(&x)));
R_TRY_CLEANUP(svcCreateSession(&qry_hnd, &service_info->mitm_query_h, 0, 0), { R_TRY(svcCreateSession(qry_hnd.GetPointer(), mitm_qry_hnd.GetPointer(), 0, 0));
svcCloseHandle(hnd);
svcCloseHandle(service_info->mitm_port_h);
service_info->mitm_port_h = 0;
});
service_info->mitm_pid = pid;
/* Set output. */ /* Copy to output. */
*out = hnd; service_info->mitm_pid = pid;
*out_query = qry_hnd; service_info->mitm_port_h = std::move(port_hnd);
service_info->mitm_query_h = std::move(mitm_qry_hnd);
*out = hnd.Move();
*out_query = qry_hnd.Move();
}
return ResultSuccess; return ResultSuccess;
} }
@ -696,7 +681,7 @@ namespace sts::sm {
info->cmd_id = 65001; info->cmd_id = 65001;
info->pid = pid; info->pid = pid;
info->tid = tid; info->tid = tid;
ipcDispatch(service_info->mitm_query_h); ipcDispatch(service_info->mitm_query_h.Get());
} }
} }
return ResultSuccess; return ResultSuccess;