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 2b091f642f
commit 813fab2046
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals/dynarmic vendored

Submodule externals/dynarmic updated: f7d11baa1c...990a569b7a

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) { } else if (id == CPSR_REGISTER) {
return thread->context.cpsr; return thread->context.cpsr;
} else if (id > CPSR_REGISTER && id < FPSCR_REGISTER) { } 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 { } else {
return 0; return 0;
} }
@@ -272,7 +272,7 @@ static void RegWrite(int id, u64 val, Kernel::Thread* thread = nullptr) {
} else if (id == CPSR_REGISTER) { } else if (id == CPSR_REGISTER) {
thread->context.cpsr = val; thread->context.cpsr = val;
} else if (id > CPSR_REGISTER && id < FPSCR_REGISTER) { } 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;
} }
} }
@@ -838,7 +838,7 @@ static void ReadRegister() {
} else if (id == FPSCR_REGISTER) { } else if (id == FPSCR_REGISTER) {
LongToGdbHex(reply, RegRead(998, current_thread)); LongToGdbHex(reply, RegRead(998, current_thread));
} else { } else {
//return SendReply("E01"); // return SendReply("E01");
LongToGdbHex(reply, RegRead(997, current_thread)); LongToGdbHex(reply, RegRead(997, current_thread));
} }
@@ -901,7 +901,7 @@ static void WriteRegister() {
} else if (id == FPSCR_REGISTER) { } else if (id == FPSCR_REGISTER) {
RegWrite(998, GdbHexToLong(buffer_ptr), current_thread); RegWrite(998, GdbHexToLong(buffer_ptr), current_thread);
} else { } else {
//return SendReply("E01"); // return SendReply("E01");
RegWrite(997, GdbHexToLong(buffer_ptr), current_thread); RegWrite(997, GdbHexToLong(buffer_ptr), current_thread);
} }
@@ -956,7 +956,11 @@ static void ReadMemory() {
SendReply("E01"); 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"); return SendReply("E00");
} }

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

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