Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-13 13:39:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

GP-3194: The MachoLoader now correctly handles

Browse Source 
DYLD_CHAINED_PTR_64_OFFSET fixups
This commit is contained in:
Ryan Kurtz
2023-03-15 06:06:07 -04:00
parent c62917317d
commit fdafa401cd
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/util/bin/format/macho/dyld/DyldChainedPtr.java
+13 -1
View File
@@ -22,7 +22,7 @@ import ghidra.program.model.reloc.Relocation.Status;
import ghidra.program.model.reloc.RelocationResult;
/**
* @see <a href="https://opensource.apple.com/source/dyld/dyld-852.2/include/mach-o/fixup-chains.h.auto.html">mach-o/fixup-chains.h</a>
* @see <a href="https://github.com/apple-oss-distributions/dyld/blob/main/include/mach-o/fixup-chains.h">mach-o/fixup-chains.h</a>
*/
public class DyldChainedPtr {
@@ -168,6 +168,18 @@ public class DyldChainedPtr {
}
}
public static boolean isRelative(DyldChainType ptrFormat) {
switch (ptrFormat) {
case DYLD_CHAINED_PTR_64_OFFSET:
case DYLD_CHAINED_PTR_ARM64E_KERNEL:
case DYLD_CHAINED_PTR_ARM64E_USERLAND:
case DYLD_CHAINED_PTR_ARM64E_USERLAND24:
return true;
default:
return false;
}
}
public static boolean isBound(DyldChainType ptrFormat, long chainValue) {
switch (ptrFormat) {
Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/MachoProgramBuilder.java
+5 -1
View File
@@ -480,6 +480,8 @@ public class MachoProgramBuilder {
}
protected boolean processExports(MachHeader header) throws Exception {
monitor.setMessage("Processing exports...");
List<ExportEntry> exports = new ArrayList<>();
// Old way - export tree in DyldInfoCommand
@@ -1794,7 +1796,9 @@ public class MachoProgramBuilder {
}
else {
newChainValue = DyldChainedPtr.getTarget(pointerFormat, chainValue);
newChainValue += imageBaseOffset;
if (DyldChainedPtr.isRelative(pointerFormat)) {
newChainValue += imageBaseOffset;
}
}
if (!start || !program.getRelocationTable().hasRelocation(chainLoc)) {