Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SharedCache] Simplify MMappedFileAccessor::Read* methods #6315

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[SharedCache] Simplify MMappedFileAccessor::Read* methods #6315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 31 additions & 52 deletions view/sharedcache/core/VM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ void MMAP::Map()
return;
}

_mmap = MapViewOfFile(
_mmap = static_cast<uint8_t*>(MapViewOfFile(
hMapping, // handle to the file mapping object
FILE_MAP_COPY, // desired access
0, // file offset (high-order DWORD)
0, // file offset (low-order DWORD)
0); // number of bytes to map (0 = entire file)
0)); // number of bytes to map (0 = entire file)

if (_mmap == nullptr)
{
Expand All @@ -174,13 +174,14 @@ void MMAP::Map()
len = ftell(fd);
fseek(fd, 0L, SEEK_SET);

_mmap = mmap(nullptr, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, fileno(fd), 0u);
if (_mmap == MAP_FAILED)
void *result = mmap(nullptr, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, fileno(fd), 0u);
if (result == MAP_FAILED)
{
// Handle error
return;
}

_mmap = static_cast<uint8_t*>(result);
mapped = true;
#endif
}
Expand Down Expand Up @@ -374,102 +375,80 @@ MMappedFileAccessor::~MMappedFileAccessor()

void MMappedFileAccessor::WritePointer(size_t address, size_t pointer)
{
((size_t*)(&((uint8_t*)m_mmap._mmap)[address]))[0] = pointer;
*(size_t*)&m_mmap._mmap[address] = pointer;
}

template <typename T>
T MMappedFileAccessor::Read(size_t address) {
T result;
Read(&result, address, sizeof(T));
return result;
}

std::string MMappedFileAccessor::ReadNullTermString(size_t address)
{
if (address > m_mmap.len)
return "";
size_t max = m_mmap.len;
size_t i = address;
std::string str;
str.reserve(140);
while (i < max)
{
char c = ((char*)(&((uint8_t*)m_mmap._mmap)[i]))[0];
if (c == 0)
break;
str += c;
i++;
}
str.shrink_to_fit();
return str;
auto start = m_mmap._mmap + address;
auto end = m_mmap._mmap + m_mmap.len;
auto nul = std::find(start, end, 0);
return std::string(start, nul);
}

uint8_t MMappedFileAccessor::ReadUChar(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((uint8_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<uint8_t>(address);
}

int8_t MMappedFileAccessor::ReadChar(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((int8_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<int8_t>(address);
}

uint16_t MMappedFileAccessor::ReadUShort(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((uint16_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<uint16_t>(address);
}

int16_t MMappedFileAccessor::ReadShort(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((int16_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<int16_t>(address);
}

uint32_t MMappedFileAccessor::ReadUInt32(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((uint32_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<uint32_t>(address);
}

int32_t MMappedFileAccessor::ReadInt32(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((int32_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<int32_t>(address);
}

uint64_t MMappedFileAccessor::ReadULong(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((uint64_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<uint64_t>(address);
}

int64_t MMappedFileAccessor::ReadLong(size_t address)
{
if (address > m_mmap.len)
throw MappingReadException();
return ((int64_t*)(&(((uint8_t*)m_mmap._mmap)[address])))[0];
return Read<int64_t>(address);
}

BinaryNinja::DataBuffer MMappedFileAccessor::ReadBuffer(size_t address, size_t length)
{
if (address > m_mmap.len)
if (m_mmap.len <= length || address > m_mmap.len - length)
throw MappingReadException();
if (address + length > m_mmap.len)
throw MappingReadException();
void* data = (void*)(&(((uint8_t*)m_mmap._mmap)[address]));
return BinaryNinja::DataBuffer(data, length);

return BinaryNinja::DataBuffer(&m_mmap._mmap[address], length);
}

void MMappedFileAccessor::Read(void* dest, size_t address, size_t length)
{
if (address > m_mmap.len)
throw MappingReadException();
if (address + length > m_mmap.len)
if (m_mmap.len <= length || address > m_mmap.len - length)
throw MappingReadException();
memcpy(dest, (void*)&(((uint8_t*)m_mmap._mmap)[address]), length);

memcpy(dest, &m_mmap._mmap[address], length);
}


Expand Down
6 changes: 4 additions & 2 deletions view/sharedcache/core/VM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class MMappedFileAccessor;
class MMAP {
friend MMappedFileAccessor;

void *_mmap;
uint8_t *_mmap;
FILE *fd;
size_t len;

Expand Down Expand Up @@ -175,8 +175,10 @@ class MMappedFileAccessor {
BinaryNinja::DataBuffer ReadBuffer(size_t addr, size_t length);

void Read(void *dest, size_t addr, size_t length);
};

template <typename T>
T Read(size_t address);
};

struct PageMapping {
std::string filePath;
Expand Down