chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ELF: Tidy up LoadOptions and handling of dumped files

Browse Source
This commit is contained in:
Katy Coe
2020-12-13 01:37:28 +01:00
parent 752cd6184c
commit 625cba808f
6 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Il2CppInspector.Common/FileFormatReaders/ElfReader.cs
View File

@@ -188,7 +188,7 @@ namespace Il2CppInspector
if (!shtShouldBeOrdered.Any()) {
// If the first file offset of the first PHT is zero, assume a dumped image
if (conv.ULong(program_header_table[0].p_vaddr) == 0ul) {
if (program_header_table.Any(t => conv.ULong(t.p_vaddr) == 0ul)) {
Console.WriteLine("ELF binary appears to be a dumped memory image");
isMemoryImage = true;
}
@@ -207,10 +207,10 @@ namespace Il2CppInspector
// Dumped images must be rebased
if (isMemoryImage) {
if (!(LoadOptions?.ImageBase is ulong newImageBase))
if (LoadOptions.ImageBase == 0xffffffff_ffffffff)
throw new InvalidOperationException("To load a dumped ELF image, you must specify the image base virtual address");
rebase(conv.FromULong(newImageBase));
rebase(conv.FromULong(LoadOptions.ImageBase));
}
// Get dynamic table if it exists (must be done after rebasing)
@@ -667,7 +667,8 @@ namespace Il2CppInspector
public override uint[] GetFunctionTable() {
// INIT_ARRAY contains a list of pointers to initialization functions (not all functions in the binary)
// INIT_ARRAYSZ contains the size of INIT_ARRAY
if (getDynamic(Elf.DT_INIT_ARRAY) == null || getDynamic(Elf.DT_INIT_ARRAYSZ) == null)
// INIT_ARRAY is probably broken in dumped images and resaved dumped images
if (getDynamic(Elf.DT_INIT_ARRAY) == null || getDynamic(Elf.DT_INIT_ARRAYSZ) == null || isMemoryImage)
return Array.Empty<uint>();
var init = MapVATR(conv.ULong(getDynamic(Elf.DT_INIT_ARRAY).d_un));

6
Il2CppInspector.Common/FileFormatReaders/LoadOptions.cs
View File

@@ -10,6 +10,10 @@ namespace Il2CppInspector
public class LoadOptions
{
// For dumped ELF files, the virtual address to which we should rebase - ignored for other file types
public ulong? ImageBase { get; set; }
// Use 2^64-1 to prevent rebasing on a dumped file
public ulong ImageBase { get; set; }
// For Linux process memory map inputs, we need the full path so we can find the .bin files
public string BinaryFilePath { get; set; }
}
}