doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected regression bug with validating memory addresses in GDB memory access command packets

Browse Source
This commit is contained in:
Nav
2022-05-04 20:47:48 +01:00
parent 4956920432
commit a28ee42239
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp
View File

@@ -75,8 +75,16 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
const auto& memoryDescriptor = memoryDescriptorsByType.at(this->memoryType); const auto& memoryDescriptor = memoryDescriptorsByType.at(this->memoryType);
/*
* In AVR targets, RAM is mapped to many registers and peripherals - we don't want to block GDB from
* accessing them.
*/
const auto memoryStartAddress = (this->memoryType == Targets::TargetMemoryType::RAM)
? 0x00
: memoryDescriptor.addressRange.startAddress;
if ( if (
this->startAddress < memoryDescriptor.addressRange.startAddress this->startAddress < memoryStartAddress
|| (this->startAddress + (this->bytes - 1)) > memoryDescriptor.addressRange.endAddress || (this->startAddress + (this->bytes - 1)) > memoryDescriptor.addressRange.endAddress
) { ) {
/* /*

10
src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.cpp
View File

@@ -91,8 +91,16 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
const auto& memoryDescriptor = memoryDescriptorsByType.at(this->memoryType); const auto& memoryDescriptor = memoryDescriptorsByType.at(this->memoryType);
/*
* In AVR targets, RAM is mapped to many registers and peripherals - we don't want to block GDB from
* accessing them.
*/
const auto memoryStartAddress = (this->memoryType == Targets::TargetMemoryType::RAM)
? 0x00
: memoryDescriptor.addressRange.startAddress;
if ( if (
this->startAddress < memoryDescriptor.addressRange.startAddress this->startAddress < memoryStartAddress
|| (this->startAddress + (this->buffer.size() - 1)) > memoryDescriptor.addressRange.endAddress || (this->startAddress + (this->buffer.size() - 1)) > memoryDescriptor.addressRange.endAddress
) { ) {
throw Exception( throw Exception(