From dc07e5d31ced1d7f8c2398c6cd3b9a2322ece98f Mon Sep 17 00:00:00 2001 From: raaller Date: Fri, 23 Oct 2026 01:54:48 +0300 Subject: [PATCH 1/2] ELF: fix DWARF 5 source file lookups --- cle/backends/elf/elf.py | 7 ++++--- tests/test_dwarf.py | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/cle/backends/elf/elf.py b/cle/backends/elf/elf.py index f345d7c70..b614426ae 100644 --- a/cle/backends/elf/elf.py +++ b/cle/backends/elf/elf.py @@ -742,6 +742,7 @@ def _load_line_info(self, dwarf): continue if lineprog is None: continue + index_offset = 1 if lineprog.header["version"] < 5 else 0 file_cache = {} for line in lineprog.get_entries(): if line.state is None: @@ -749,13 +750,13 @@ def _load_line_info(self, dwarf): if line.state.file in file_cache: filename = file_cache[line.state.file] else: - file_entry = lineprog.header["file_entry"][line.state.file - 1] - if file_entry["dir_index"] == 0: + file_entry = lineprog.header["file_entry"][line.state.file - index_offset] + if file_entry["dir_index"] == 0 and index_offset == 1: filename = pathlib.PurePosixPath(comp_dir) / file_entry.name.decode() else: filename = ( pathlib.PurePosixPath(comp_dir) - / lineprog.header["include_directory"][file_entry["dir_index"] - 1].decode() + / lineprog.header["include_directory"][file_entry["dir_index"] - index_offset].decode() / file_entry.name.decode() ) file_cache[line.state.file] = filename diff --git a/tests/test_dwarf.py b/tests/test_dwarf.py index 99e3c60b2..c60a0d187 100644 --- a/tests/test_dwarf.py +++ b/tests/test_dwarf.py @@ -3,6 +3,9 @@ import os from unittest import TestCase, main +from unittest.mock import Mock + +from elftools.construct import Container import cle @@ -10,6 +13,40 @@ class TestDwarf(TestCase): + def test_line_program_file_indices(self): + cases = ( + (4, (1, 2), [b"include"], "/build/main.c", "/build/include/header.h"), + (5, (0, 1), [b"source", b"include"], "/build/source/main.c", "/build/include/header.h"), + (5, (0, 1), [b"/source", b"/include"], "/source/main.c", "/include/header.h"), + ) + for version, files, directories, main_path, header_path in cases: + with self.subTest(version=version, directories=directories): + cu = Mock() + cu.get_top_DIE.return_value.attributes = {"DW_AT_comp_dir": Container(value=b"/build")} + lineprog = Mock() + lineprog.header = Container( + version=version, + file_entry=[Container(name=b"main.c", dir_index=0), Container(name=b"header.h", dir_index=1)], + include_directory=directories, + ) + lineprog.get_entries.return_value = [Container(state=None)] + [ + Container(state=Container(address=addr, file=file, line=line)) + for addr, file, line in ((0x1010, files[0], 11), (0x1011, files[1], 23), (0x1012, files[0], 12)) + ] + dwarf = Mock() + dwarf.iter_CUs.return_value = [cu] + dwarf.line_program_for_CU.return_value = lineprog + elf = cle.backends.ELF.__new__(cle.backends.ELF) + elf.linked_base = 0x1000 + elf.mapped_base = 0x4000 + elf.addr_to_line = {} + elf._load_line_info(dwarf) + assert elf.addr_to_line == { + 0x4010: {(main_path, 11)}, + 0x4011: {(header_path, 23)}, + 0x4012: {(main_path, 12)}, + } + def test_rust_binary(self): binary_path = os.path.join( TESTS_BASE, "x86_64", "1cbbf108f44c8f4babde546d26425ca5340dccf878d306b90eb0fbec2f83ab51" From 883cdf08a7cabb14667379d668fe45f873e77185 Mon Sep 17 00:00:00 2001 From: raaller Date: Thu, 12 Nov 2026 13:17:21 +0300 Subject: [PATCH 2/2] test: use real ELF fixtures for DWARF line filenames --- tests/test_dwarf.py | 63 +++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/tests/test_dwarf.py b/tests/test_dwarf.py index c60a0d187..85086cb70 100644 --- a/tests/test_dwarf.py +++ b/tests/test_dwarf.py @@ -2,10 +2,8 @@ from __future__ import annotations import os +from pathlib import PurePosixPath from unittest import TestCase, main -from unittest.mock import Mock - -from elftools.construct import Container import cle @@ -14,38 +12,35 @@ class TestDwarf(TestCase): def test_line_program_file_indices(self): - cases = ( - (4, (1, 2), [b"include"], "/build/main.c", "/build/include/header.h"), - (5, (0, 1), [b"source", b"include"], "/build/source/main.c", "/build/include/header.h"), - (5, (0, 1), [b"/source", b"/include"], "/source/main.c", "/include/header.h"), + load_options = ( + (0x400000, {}), + (0x700000, {"base_addr": 0x700000, "force_rebase": True}), ) - for version, files, directories, main_path, header_path in cases: - with self.subTest(version=version, directories=directories): - cu = Mock() - cu.get_top_DIE.return_value.attributes = {"DW_AT_comp_dir": Container(value=b"/build")} - lineprog = Mock() - lineprog.header = Container( - version=version, - file_entry=[Container(name=b"main.c", dir_index=0), Container(name=b"header.h", dir_index=1)], - include_directory=directories, - ) - lineprog.get_entries.return_value = [Container(state=None)] + [ - Container(state=Container(address=addr, file=file, line=line)) - for addr, file, line in ((0x1010, files[0], 11), (0x1011, files[1], 23), (0x1012, files[0], 12)) - ] - dwarf = Mock() - dwarf.iter_CUs.return_value = [cu] - dwarf.line_program_for_CU.return_value = lineprog - elf = cle.backends.ELF.__new__(cle.backends.ELF) - elf.linked_base = 0x1000 - elf.mapped_base = 0x4000 - elf.addr_to_line = {} - elf._load_line_info(dwarf) - assert elf.addr_to_line == { - 0x4010: {(main_path, 11)}, - 0x4011: {(header_path, 23)}, - 0x4012: {(main_path, 12)}, - } + for variant in ("v4", "v5_relative", "v5_absolute"): + binary_path = os.path.join(TESTS_BASE, "x86_64", f"dwarf_line_filenames_{variant}") + for base_addr, main_opts in load_options: + with self.subTest(variant=variant, base_addr=base_addr): + ld = cle.Loader( + binary_path, + auto_load_libs=False, + load_debug_info=True, + main_opts=main_opts, + ) + elf = ld.main_object + assert isinstance(elf, cle.backends.ELF) + assert elf.mapped_base == base_addr + assert elf.compilation_units is not None and len(elf.compilation_units) == 1 + comp_dir = PurePosixPath(elf.compilation_units[0].comp_dir) + assert comp_dir.is_absolute() + + main_symbol = elf.get_symbol("main") + increment_symbol = elf.get_symbol("increment") + assert main_symbol is not None + assert increment_symbol is not None + main_path = comp_dir / "main.c" + header_path = comp_dir / "include" / "header.h" + assert elf.addr_to_line[main_symbol.rebased_addr] == {(str(main_path), 4)} + assert elf.addr_to_line[increment_symbol.rebased_addr] == {(str(header_path), 2)} def test_rust_binary(self): binary_path = os.path.join(