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

sm: refactor to use R_TRY

Browse source
This commit is contained in:
Michael Scire 2019-06-17 09:17:53 -07:00
parent a0cf3bbed8
commit dfcba5e6d4
10 changed files with 157 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
stratosphere/sm/source/sm_registration.cpp
View file

@ -281,13 +281,14 @@ Result Registration::GetServiceHandle(u64 pid, u64 service, Handle *out) {
rc = svcConnectToPort(out, target_service->port_h); rc = svcConnectToPort(out, target_service->port_h);
} }
} }
if (R_FAILED(rc)) { /* Convert Kernel result to SM result. */
if ((rc & 0x3FFFFF) == ResultKernelOutOfSessions) { R_TRY_CATCH(rc) {
R_CATCH(ResultKernelOutOfSessions) {
return ResultSmInsufficientSessions; return ResultSmInsufficientSessions;
} }
} } R_END_TRY_CATCH;
return rc; return ResultSuccess;
} }
Result Registration::GetServiceForPid(u64 pid, u64 service, Handle *out) { Result Registration::GetServiceForPid(u64 pid, u64 service, Handle *out) {
@ -365,24 +366,19 @@ Result Registration::RegisterServiceForPid(u64 pid, u64 service, u64 max_session
*out = 0; *out = 0;
*free_service = (const Registration::Service){0}; *free_service = (const Registration::Service){0};
Result rc = svcCreatePort(out, &free_service->port_h, max_sessions, is_light, (char *)&free_service->service_name); R_TRY(svcCreatePort(out, &free_service->port_h, max_sessions, is_light, (char *)&free_service->service_name));
if (R_SUCCEEDED(rc)) { free_service->service_name = service;
free_service->service_name = service; free_service->owner_pid = pid;
free_service->owner_pid = pid; free_service->max_sessions = max_sessions;
free_service->max_sessions = max_sessions; free_service->is_light = is_light;
free_service->is_light = is_light;
}
return rc; return ResultSuccess;
} }
Result Registration::RegisterServiceForSelf(u64 service, u64 max_sessions, bool is_light, Handle *out) { Result Registration::RegisterServiceForSelf(u64 service, u64 max_sessions, bool is_light, Handle *out) {
u64 pid; u64 pid;
Result rc = svcGetProcessId(&pid, CUR_PROCESS_HANDLE); R_TRY(svcGetProcessId(&pid, CUR_PROCESS_HANDLE));
if (R_FAILED(rc)) {
return rc;
}
u64 service_name_len = GetServiceNameLength(service); u64 service_name_len = GetServiceNameLength(service);
@ -408,16 +404,14 @@ Result Registration::RegisterServiceForSelf(u64 service, u64 max_sessions, bool
*out = 0; *out = 0;
*free_service = (const Registration::Service){0}; *free_service = (const Registration::Service){0};
rc = svcCreatePort(out, &free_service->port_h, max_sessions, is_light, (char *)&free_service->service_name); R_TRY(svcCreatePort(out, &free_service->port_h, max_sessions, is_light, (char *)&free_service->service_name));
if (R_SUCCEEDED(rc)) { free_service->service_name = service;
free_service->service_name = service; free_service->owner_pid = pid;
free_service->owner_pid = pid; free_service->max_sessions = max_sessions;
free_service->max_sessions = max_sessions; free_service->is_light = is_light;
free_service->is_light = is_light;
}
return rc; return ResultSuccess;
} }
Result Registration::UnregisterServiceForPid(u64 pid, u64 service) { Result Registration::UnregisterServiceForPid(u64 pid, u64 service) {
@ -486,13 +480,12 @@ Result Registration::InstallMitmForPid(u64 pid, u64 service, Handle *out, Handle
*out = 0; *out = 0;
u64 x = 0; u64 x = 0;
Result rc = svcCreatePort(out, &target_service->mitm_port_h, target_service->max_sessions, target_service->is_light, (char *)&x); R_TRY(svcCreatePort(out, &target_service->mitm_port_h, target_service->max_sessions, target_service->is_light, (char *)&x));
R_TRY(svcCreateSession(query_out, &target_service->mitm_query_h, 0, 0));
if (R_SUCCEEDED(rc) && R_SUCCEEDED((rc = svcCreateSession(query_out, &target_service->mitm_query_h, 0, 0)))) { target_service->mitm_pid = pid;
target_service->mitm_pid = pid;
}
return rc; return ResultSuccess;
} }
Result Registration::UninstallMitmForPid(u64 pid, u64 service) { Result Registration::UninstallMitmForPid(u64 pid, u64 service) {

97
stratosphere/sm/source/sm_user_service.cpp
View file

@ -27,99 +27,82 @@ Result UserService::Initialize(PidDescriptor pid) {
Result UserService::GetService(Out<MovedHandle> out_h, SmServiceName service) { Result UserService::GetService(Out<MovedHandle> out_h, SmServiceName service) {
Handle session_h = 0; Handle session_h = 0;
Result rc = ResultSmInvalidClient;
#ifdef SM_ENABLE_SMHAX
if (!this->has_initialized) { if (!this->has_initialized) {
rc = Registration::GetServiceForPid(Registration::GetInitialProcessId(), smEncodeName(service.name), &session_h); return ResultSmInvalidClient;
}
#endif
if (this->has_initialized) {
rc = Registration::GetServiceForPid(this->pid, smEncodeName(service.name), &session_h);
} }
if (R_SUCCEEDED(rc)) { R_TRY(Registration::GetServiceForPid(this->pid, smEncodeName(service.name), &session_h));
out_h.SetValue(session_h);
} out_h.SetValue(session_h);
return rc; return ResultSuccess;
} }
Result UserService::RegisterService(Out<MovedHandle> out_h, SmServiceName service, u32 max_sessions, bool is_light) { Result UserService::RegisterService(Out<MovedHandle> out_h, SmServiceName service, u32 max_sessions, bool is_light) {
Handle service_h = 0; Handle service_h = 0;
Result rc = ResultSmInvalidClient;
#ifdef SM_ENABLE_SMHAX
if (!this->has_initialized) { if (!this->has_initialized) {
rc = Registration::RegisterServiceForPid(Registration::GetInitialProcessId(), smEncodeName(service.name), max_sessions, (is_light & 1) != 0, &service_h); return ResultSmInvalidClient;
}
#endif
if (this->has_initialized) {
rc = Registration::RegisterServiceForPid(this->pid, smEncodeName(service.name), max_sessions, (is_light & 1) != 0, &service_h);
} }
if (R_SUCCEEDED(rc)) { R_TRY(Registration::RegisterServiceForPid(this->pid, smEncodeName(service.name), max_sessions, (is_light & 1) != 0, &service_h));
out_h.SetValue(service_h);
} out_h.SetValue(service_h);
return rc; return ResultSuccess;
} }
Result UserService::UnregisterService(SmServiceName service) { Result UserService::UnregisterService(SmServiceName service) {
Result rc = ResultSmInvalidClient;
#ifdef SM_ENABLE_SMHAX
if (!this->has_initialized) { if (!this->has_initialized) {
rc = Registration::UnregisterServiceForPid(Registration::GetInitialProcessId(), smEncodeName(service.name)); return ResultSmInvalidClient;
} }
#endif
if (this->has_initialized) { return Registration::UnregisterServiceForPid(this->pid, smEncodeName(service.name));
rc = Registration::UnregisterServiceForPid(this->pid, smEncodeName(service.name));
}
return rc;
} }
Result UserService::AtmosphereInstallMitm(Out<MovedHandle> srv_h, Out<MovedHandle> qry_h, SmServiceName service) { Result UserService::AtmosphereInstallMitm(Out<MovedHandle> srv_h, Out<MovedHandle> qry_h, SmServiceName service) {
Handle service_h = 0; Handle service_h = 0;
Handle query_h = 0; Handle query_h = 0;
Result rc = ResultSmInvalidClient;
if (this->has_initialized) { if (!this->has_initialized) {
rc = Registration::InstallMitmForPid(this->pid, smEncodeName(service.name), &service_h, &query_h); return ResultSmInvalidClient;
} }
if (R_SUCCEEDED(rc)) { R_TRY(Registration::InstallMitmForPid(this->pid, smEncodeName(service.name), &service_h, &query_h));
srv_h.SetValue(service_h);
qry_h.SetValue(query_h); srv_h.SetValue(service_h);
} qry_h.SetValue(query_h);
return rc; return ResultSuccess;
} }
Result UserService::AtmosphereUninstallMitm(SmServiceName service) { Result UserService::AtmosphereUninstallMitm(SmServiceName service) {
Result rc = ResultSmInvalidClient; if (!this->has_initialized) {
if (this->has_initialized) { return ResultSmInvalidClient;
rc = Registration::UninstallMitmForPid(this->pid, smEncodeName(service.name));
} }
return rc;
return Registration::UninstallMitmForPid(this->pid, smEncodeName(service.name));
} }
Result UserService::AtmosphereAcknowledgeMitmSession(Out<u64> client_pid, Out<MovedHandle> fwd_h, SmServiceName service) { Result UserService::AtmosphereAcknowledgeMitmSession(Out<u64> client_pid, Out<MovedHandle> fwd_h, SmServiceName service) {
Result rc = ResultSmInvalidClient;
Handle out_fwd_h = 0; Handle out_fwd_h = 0;
if (this->has_initialized) {
rc = Registration::AcknowledgeMitmSessionForPid(this->pid, smEncodeName(service.name), &out_fwd_h, client_pid.GetPointer()); if (!this->has_initialized) {
return ResultSmInvalidClient;
} }
if (R_SUCCEEDED(rc)) { R_TRY(Registration::AcknowledgeMitmSessionForPid(this->pid, smEncodeName(service.name), &out_fwd_h, client_pid.GetPointer()));
fwd_h.SetValue(out_fwd_h);
}
return rc; fwd_h.SetValue(out_fwd_h);
return ResultSuccess;
} }
Result UserService::AtmosphereAssociatePidTidForMitm(u64 pid, u64 tid) { Result UserService::AtmosphereAssociatePidTidForMitm(u64 pid, u64 tid) {
Result rc = ResultSmInvalidClient; if (!this->has_initialized) {
if (this->has_initialized) { return ResultSmInvalidClient;
if (Registration::IsInitialProcess(pid)) {
rc = ResultSmNotAllowed;
} else {
rc = Registration::AssociatePidTidForMitm(pid, tid);
}
} }
return rc;
if (Registration::IsInitialProcess(pid)) {
return ResultSmNotAllowed;
}
return Registration::AssociatePidTidForMitm(pid, tid);
} }