nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

libstratosphere: Fix uninitialized memory bug.

Browse source
This commit is contained in:
Michael Scire 2018-10-29 22:17:41 -07:00 committed by SciresM
parent 23a85a7c24
commit 4cdd9aa8f1
5 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
stratosphere/libstratosphere/include/stratosphere/ipc/ipc_service_object.hpp
View file

@ -124,6 +124,7 @@ class ServiceObjectHolder {
} }
ServiceObjectHolder Clone() { ServiceObjectHolder Clone() {
return ServiceObjectHolder(*this); ServiceObjectHolder clone(*this);
return clone;
} }
}; };

8
stratosphere/libstratosphere/include/stratosphere/mitm/imitmserviceobject.hpp
View file

@ -28,6 +28,14 @@ class IMitmServiceObject : public IServiceObject {
public: public:
IMitmServiceObject(std::shared_ptr<Service> s) : forward_service(s) {} IMitmServiceObject(std::shared_ptr<Service> s) : forward_service(s) {}
virtual u64 GetTitleId() {
return this->title_id;
}
virtual u64 GetProcessId() {
return this->process_id;
}
static bool ShouldMitm(u64 pid, u64 tid); static bool ShouldMitm(u64 pid, u64 tid);
protected: protected:

14
stratosphere/libstratosphere/include/stratosphere/mitm/mitm_server.hpp
View file

@ -32,7 +32,10 @@ class MitmServer : public IWaitable {
public: public:
MitmServer(Handle *out_query_h, const char *service_name, unsigned int max_s) : port_handle(0), max_sessions(max_s) { MitmServer(Handle *out_query_h, const char *service_name, unsigned int max_s) : port_handle(0), max_sessions(max_s) {
Handle tmp_hnd; Handle tmp_hnd;
Result rc; Result rc = smMitMInitialize();
if (R_FAILED(rc)) {
fatalSimple(rc);
}
if (R_SUCCEEDED((rc = smGetServiceOriginal(&tmp_hnd, smEncodeName(service_name))))) { if (R_SUCCEEDED((rc = smGetServiceOriginal(&tmp_hnd, smEncodeName(service_name))))) {
svcCloseHandle(tmp_hnd); svcCloseHandle(tmp_hnd);
@ -44,6 +47,8 @@ class MitmServer : public IWaitable {
if (R_FAILED((rc = smMitMInstall(&this->port_handle, out_query_h, mitm_name)))) { if (R_FAILED((rc = smMitMInstall(&this->port_handle, out_query_h, mitm_name)))) {
fatalSimple(rc); fatalSimple(rc);
} }
smMitMExit();
} }
virtual ~MitmServer() override { virtual ~MitmServer() override {
@ -79,10 +84,17 @@ class MitmServer : public IWaitable {
delete s; delete s;
}); });
rc = smMitMInitialize();
if (R_FAILED(rc)) {
fatalSimple(rc);
}
if (R_FAILED(smMitMGetService(forward_service.get(), mitm_name))) { if (R_FAILED(smMitMGetService(forward_service.get(), mitm_name))) {
/* TODO: Panic. */ /* TODO: Panic. */
} }
smMitMExit();
this->GetSessionManager()->AddWaitable(new MitmSession(session_h, forward_service, std::make_shared<T>(forward_service))); this->GetSessionManager()->AddWaitable(new MitmSession(session_h, forward_service, std::make_shared<T>(forward_service)));
return 0; return 0;
} }

13
stratosphere/libstratosphere/include/stratosphere/mitm/mitm_session.hpp
View file

@ -30,7 +30,7 @@ class MitmSession final : public ServiceSession {
void (*service_post_process_handler)(IMitmServiceObject *, IpcResponseContext *); void (*service_post_process_handler)(IMitmServiceObject *, IpcResponseContext *);
/* For cleanup usage. */ /* For cleanup usage. */
u32 num_fwd_copy_hnds; u32 num_fwd_copy_hnds = 0;
Handle fwd_copy_hnds[8]; Handle fwd_copy_hnds[8];
public: public:
template<typename T> template<typename T>
@ -46,7 +46,7 @@ class MitmSession final : public ServiceSession {
} }
this->pointer_buffer.resize(pbs); this->pointer_buffer.resize(pbs);
this->control_holder.Reset(); this->control_holder.Reset();
this->control_holder = ServiceObjectHolder(std::make_shared<IMitmHipcControlService>(this)); this->control_holder = std::move(ServiceObjectHolder(std::move(std::make_shared<IMitmHipcControlService>(this))));
} }
MitmSession(Handle s_h, std::shared_ptr<Service> fs, ServiceObjectHolder &&h, void (*pph)(IMitmServiceObject *, IpcResponseContext *)) : ServiceSession(s_h) { MitmSession(Handle s_h, std::shared_ptr<Service> fs, ServiceObjectHolder &&h, void (*pph)(IMitmServiceObject *, IpcResponseContext *)) : ServiceSession(s_h) {
@ -62,7 +62,7 @@ class MitmSession final : public ServiceSession {
} }
this->pointer_buffer.resize(pbs); this->pointer_buffer.resize(pbs);
this->control_holder.Reset(); this->control_holder.Reset();
this->control_holder = ServiceObjectHolder(std::make_shared<IMitmHipcControlService>(this)); this->control_holder = std::move(ServiceObjectHolder(std::move(std::make_shared<IMitmHipcControlService>(this))));
} }
virtual void PreProcessRequest(IpcResponseContext *ctx) override { virtual void PreProcessRequest(IpcResponseContext *ctx) override {
@ -101,7 +101,7 @@ class MitmSession final : public ServiceSession {
} }
return rc; return rc;
} }
virtual Result GetResponse(IpcResponseContext *ctx) { virtual Result GetResponse(IpcResponseContext *ctx) {
Result rc = 0xF601; Result rc = 0xF601;
FirmwareVersion fw = GetRuntimeFirmwareVersion(); FirmwareVersion fw = GetRuntimeFirmwareVersion();
@ -130,7 +130,8 @@ class MitmSession final : public ServiceSession {
{ {
auto sub_obj = ctx->obj_holder->GetServiceObject<IDomainObject>()->GetObject(ctx->request.InThisObjectId); auto sub_obj = ctx->obj_holder->GetServiceObject<IDomainObject>()->GetObject(ctx->request.InThisObjectId);
if (sub_obj == nullptr) { if (sub_obj == nullptr) {
return ForwardRequest(ctx); rc = ForwardRequest(ctx);
return rc;
} }
dispatch_table = sub_obj->GetDispatchTable(); dispatch_table = sub_obj->GetDispatchTable();
entry_count = sub_obj->GetDispatchTableEntryCount(); entry_count = sub_obj->GetDispatchTableEntryCount();
@ -152,7 +153,7 @@ class MitmSession final : public ServiceSession {
memcpy(armGetTls(), this->backup_tls, sizeof(this->backup_tls)); memcpy(armGetTls(), this->backup_tls, sizeof(this->backup_tls));
rc = ForwardRequest(ctx); rc = ForwardRequest(ctx);
} }
return rc; return rc;
} }

14
stratosphere/libstratosphere/include/stratosphere/waitable_manager.hpp
View file

@ -165,6 +165,7 @@ class WaitableManager : public SessionManagerBase {
if (result == nullptr) { if (result == nullptr) {
std::vector<Handle> handles; std::vector<Handle> handles;
std::vector<IWaitable *> wait_list;
int handle_index = 0; int handle_index = 0;
Result rc; Result rc;
@ -174,11 +175,14 @@ class WaitableManager : public SessionManagerBase {
/* Copy out handles. */ /* Copy out handles. */
handles.resize(this->waitables.size() + 1); handles.resize(this->waitables.size() + 1);
wait_list.resize(this->waitables.size() + 1);
handles[0] = this->new_waitable_event->GetHandle(); handles[0] = this->new_waitable_event->GetHandle();
wait_list[0] = this->new_waitable_event;
unsigned int num_handles = 1; unsigned int num_handles = 1;
for (unsigned int i = 0; i < this->waitables.size(); i++) { for (unsigned int i = 0; i < this->waitables.size(); i++) {
Handle h = this->waitables[i]->GetHandle(); Handle h = this->waitables[i]->GetHandle();
if (h != INVALID_HANDLE) { if (h != INVALID_HANDLE) {
wait_list[num_handles] = this->waitables[i];
handles[num_handles++] = h; handles[num_handles++] = h;
} }
} }
@ -194,14 +198,15 @@ class WaitableManager : public SessionManagerBase {
/* Wait forever. */ /* Wait forever. */
rc = svcWaitSynchronization(&handle_index, handles.data(), num_handles, U64_MAX); rc = svcWaitSynchronization(&handle_index, handles.data(), num_handles, U64_MAX);
IWaitable *w = this->waitables[handle_index - 1]; IWaitable *w = wait_list[handle_index];
size_t w_ind = std::distance(this->waitables.begin(), std::find(this->waitables.begin(), this->waitables.end(), w));
if (R_SUCCEEDED(rc)) { if (R_SUCCEEDED(rc)) {
if (handle_index == 0) { if (handle_index == 0) {
AddWaitablesInternal(); AddWaitablesInternal();
continue; continue;
} }
std::for_each(waitables.begin(), waitables.begin() + handle_index - 1, std::mem_fn(&IWaitable::UpdatePriority)); std::for_each(waitables.begin(), waitables.begin() + w_ind, std::mem_fn(&IWaitable::UpdatePriority));
result = w; result = w;
} else if (rc == 0xEA01) { } else if (rc == 0xEA01) {
/* Timeout: Just update priorities. */ /* Timeout: Just update priorities. */
@ -216,8 +221,9 @@ class WaitableManager : public SessionManagerBase {
if (handle_index == 0) { if (handle_index == 0) {
std::abort(); std::abort();
} }
this->waitables.erase(this->waitables.begin() + handle_index - 1);
std::for_each(waitables.begin(), waitables.begin() + handle_index - 1, std::mem_fn(&IWaitable::UpdatePriority)); this->waitables.erase(this->waitables.begin() + w_ind);
std::for_each(waitables.begin(), waitables.begin() + w_ind - 1, std::mem_fn(&IWaitable::UpdatePriority));
delete w; delete w;
} }
} }