prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid crash in IsValidVirtualAddress()

Browse Source
This commit is contained in:
Jarek Syrylak
2018-07-10 10:25:34 +01:00
parent 4a657f5fb6
commit 9cb1f759ca
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/gdbstub/gdbstub.cpp
View File

@@ -252,7 +252,7 @@ static u64 RegRead(int id, Kernel::Thread* thread = nullptr) {
} else if (id == CPSR_REGISTER) {
return thread->context.cpsr;
} else if (id > CPSR_REGISTER && id < FPSCR_REGISTER) {
return thread->context.fpu_registers[id-UC_ARM64_REG_Q0][0];
return thread->context.fpu_registers[id - UC_ARM64_REG_Q0][0];
} else {
return 0;
}
@@ -272,7 +272,7 @@ static void RegWrite(int id, u64 val, Kernel::Thread* thread = nullptr) {
} else if (id == CPSR_REGISTER) {
thread->context.cpsr = val;
} else if (id > CPSR_REGISTER && id < FPSCR_REGISTER) {
thread->context.fpu_registers[id-(CPSR_REGISTER+1)][0] = val;
thread->context.fpu_registers[id - (CPSR_REGISTER + 1)][0] = val;
}
}
@@ -839,7 +839,7 @@ static void ReadRegister() {
} else if (id == FPSCR_REGISTER) {
LongToGdbHex(reply, RegRead(998, current_thread));
} else {
//return SendReply("E01");
// return SendReply("E01");
LongToGdbHex(reply, RegRead(997, current_thread));
}
@@ -902,7 +902,7 @@ static void WriteRegister() {
} else if (id == FPSCR_REGISTER) {
RegWrite(998, GdbHexToLong(buffer_ptr), current_thread);
} else {
//return SendReply("E01");
// return SendReply("E01");
RegWrite(997, GdbHexToLong(buffer_ptr), current_thread);
}
@@ -957,7 +957,11 @@ static void ReadMemory() {
SendReply("E01");
}
if (!Memory::IsValidVirtualAddress(addr) && (addr < Memory::STACK_AREA_VADDR)) {
if ((addr < Memory::PROCESS_IMAGE_VADDR) || (addr >= Memory::MAP_REGION_VADDR_END)) {
return SendReply("E00");
}
if (!Memory::IsValidVirtualAddress(addr)) {
return SendReply("E00");
}

4
src/core/loader/nro.cpp
View File

@@ -117,8 +117,8 @@ bool AppLoader_NRO::LoadNro(const std::string& path, VAddr load_base) {
Core::CurrentProcess()->LoadModule(codeset, load_base);
std::string filename;
Common::SplitPath(path, nullptr, &filename, nullptr);
GDBStub::RegisterModule((filename+".elf").c_str(), load_base, load_base);
Common::SplitPath(codeset->name, nullptr, &filename, nullptr);
GDBStub::RegisterModule((filename + ".elf").c_str(), load_base, load_base);
return true;
}