ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-06 05:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

error check relocations

Browse Source
This commit is contained in:
Nikita Smith
2025-06-25 10:53:22 -07:00
committed by Ryan Fleury
parent ad069cb854
commit c98ae0925f
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/coff/coff.h
+1
View File
@@ -385,6 +385,7 @@ enum
COFF_Reloc_X64_Pair = 0xF, COFF_Reloc_X64_Pair = 0xF,
COFF_Reloc_X64_SSpan32 = 0x10, COFF_Reloc_X64_SSpan32 = 0x10,
COFF_Reloc_X64_Unknown_11 = 0x11, COFF_Reloc_X64_Unknown_11 = 0x11,
COFF_Reloc_X64_Last = COFF_Reloc_X64_Unknown_11,
}; };
typedef COFF_RelocType COFF_Reloc_X86; typedef COFF_RelocType COFF_Reloc_X86;
src/linker/lnk.c
+18 -1
View File
@@ -1101,6 +1101,15 @@ THREAD_POOL_TASK_FUNC(lnk_obj_reloc_patcher)
for (U64 reloc_idx = 0; reloc_idx < reloc_info.count; reloc_idx += 1) { for (U64 reloc_idx = 0; reloc_idx < reloc_info.count; reloc_idx += 1) {
COFF_Reloc *reloc = &relocs[reloc_idx]; COFF_Reloc *reloc = &relocs[reloc_idx];
// error check relocation
if (obj->header.machine == COFF_MachineType_X64) {
if (reloc->type > COFF_Reloc_X64_Last) {
lnk_error_obj(LNK_Error_IllegalRelocation, obj, "unknown relocation 0x%x", reloc->type);
}
} else if (obj->header.machine == COFF_MachineType_Unknown) {
NotImplemented;
}
// compute relocation file/virtual offsets // compute relocation file/virtual offsets
U64 reloc_foff = section_header->foff + reloc->apply_off; U64 reloc_foff = section_header->foff + reloc->apply_off;
U64 reloc_voff = section_header->voff + reloc->apply_off; U64 reloc_voff = section_header->voff + reloc->apply_off;
@@ -1121,8 +1130,16 @@ THREAD_POOL_TASK_FUNC(lnk_obj_reloc_patcher)
if (interp == COFF_SymbolValueInterp_Regular) { if (interp == COFF_SymbolValueInterp_Regular) {
symbol_secnum = symbol.section_number; symbol_secnum = symbol.section_number;
symbol_secoff = symbol.value; symbol_secoff = symbol.value;
symbol_voff = task->image_section_table[symbol.section_number]->voff + symbol_secoff; symbol_voff = safe_cast_u32((U64)task->image_section_table[symbol.section_number]->voff + (U64)symbol_secoff);
} else if (interp == COFF_SymbolValueInterp_Abs) { } else if (interp == COFF_SymbolValueInterp_Abs) {
// error check relocation
if (obj->header.machine == COFF_MachineType_X64) {
if (reloc->type == COFF_Reloc_X64_SecRel) {
lnk_error_obj(LNK_Error_IllegalRelocation, obj, "section-relative relocation (No. 0x%x) cannot be applied to absolute symbol (No. 0x%x)", reloc_idx, reloc->isymbol);
}
} else if (obj->header.machine != COFF_MachineType_Unknown) {
NotImplemented;
}
symbol_secnum = 0; symbol_secnum = 0;
symbol_secoff = 0; symbol_secoff = 0;
symbol_voff = safe_cast_u32(symbol.value); symbol_voff = safe_cast_u32(symbol.value);
src/linker/lnk_error.h
+1
View File
@@ -35,6 +35,7 @@ typedef enum
LNK_Error_MultiplyDefinedSymbol, LNK_Error_MultiplyDefinedSymbol,
LNK_Error_SectRefsDiscardedMemory, LNK_Error_SectRefsDiscardedMemory,
LNK_Error_IllegalSectionMerge, LNK_Error_IllegalSectionMerge,
LNK_Error_IllegalRelocation,
LNK_Error_StopLast, LNK_Error_StopLast,
LNK_Error_First, LNK_Error_First,