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

annotate Attributes argument for SetVariable() when possible #102

Merged
merged 4 commits into from
Dec 7, 2024
Merged

annotate Attributes argument for SetVariable() when possible #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95786d6
remove -undefined warning and -ld_classic options;
yeggor Dec 7, 2024
96fa03d
add optimisations for loader
yeggor Dec 7, 2024
c439679
improve tid_t initialisation for MACRO_ types (enums);
yeggor Dec 7, 2024
ce90832
apply op_enum() for Attributes only when operand is an immediate value
yeggor Dec 7, 2024
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
29 changes: 6 additions & 23 deletions cmake/FindIdaSdk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@
include(CMakeParseArguments)
include(FindPackageHandleStandardArgs)

option(USE_LD_CLASSIC "Use -ld_classic option" OFF)
if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"
AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "15.0.0")
set(USE_LD_CLASSIC ON)
endif()

find_path(
IdaSdk_DIR
NAMES include/pro.h
Expand Down Expand Up @@ -137,15 +131,9 @@ function(_ida_plugin name ea64 link_script) # ARGN contains sources
if(UNIX)
target_compile_options(${t} PUBLIC ${_ida_compile_options})
if(APPLE)
if(USE_LD_CLASSIC)
target_link_libraries(
${t} ${_ida_compile_options} -Wl,-ld_classic -Wl,-flat_namespace
-Wl,-undefined,warning -Wl,-exported_symbol,_PLUGIN)
else()
target_link_libraries(
${t} ${_ida_compile_options} -Wl,-flat_namespace
-Wl,-undefined,warning -Wl,-exported_symbol,_PLUGIN)
endif()
target_link_libraries(
${t} ${_ida_compile_options} -Wl,-flat_namespace
-Wl,-undefined,dynamic_lookup -Wl,-exported_symbol,_PLUGIN)
else()
# Always use the linker script needed for IDA.
target_link_libraries(${t} ${_ida_compile_options} -Wl,--version-script
Expand Down Expand Up @@ -180,14 +168,9 @@ function(_ida_loader name ea64 link_script)
if(UNIX)
target_compile_options(${t} PUBLIC ${_ida_compile_options})
if(APPLE)
if(USE_LD_CLASSIC)
target_link_libraries(
${t} ${_ida_compile_options} -Wl,-ld_classic -Wl,-flat_namespace
-Wl,-undefined,warning -Wl,-exported_symbol,_LDSC)
else()
target_link_libraries(${t} ${_ida_compile_options} -Wl,-flat_namespace
-Wl,-undefined,warning -Wl,-exported_symbol,_LDSC)
endif()
target_link_libraries(
${t} ${_ida_compile_options} -Wl,-flat_namespace
-Wl,-undefined,dynamic_lookup -Wl,-exported_symbol,_LDSC)
else()
# Always use the linker script needed for IDA.
target_link_libraries(${t} ${_ida_compile_options} -Wl,--version-script
Expand Down
4 changes: 4 additions & 0 deletions efiXloader/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
"${CMAKE_CXX_FLAGS} -Wno-nullability-completeness -Wno-varargs")
endif()

if(NOT MSVC)
add_compile_options(-O3 -flto)
endif()

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake)

find_package(IdaSdk REQUIRED)
Expand Down
4 changes: 4 additions & 0 deletions efiXplorer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
"${CMAKE_CXX_FLAGS} -Wno-nullability-completeness -Wno-varargs")
endif()

if(NOT MSVC)
add_compile_options(-O3 -flto)
endif()

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../cmake)

find_package(IdaSdk REQUIRED)
Expand Down
22 changes: 6 additions & 16 deletions efiXplorer/efi_analysis.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class efi_analyser_t {
ea_list_t m_double_get_variable;

tid_t m_macro_efi_tid;
tid_t m_macro_var_attr_tid;

// mask and masked value for MACRO_EFI enum value detection
uint64_t m_mask = 0;
Expand Down Expand Up @@ -373,14 +374,8 @@ class efi_analyser_x86_t : public efi_analyser_t {
import_type(idati, -1, "EFI_PEI_SERVICES");
import_type(idati, -1, "EFI_PEI_READ_ONLY_VARIABLE2_PPI");
import_type(idati, -1, "EFI_SMM_VARIABLE_PROTOCOL");
import_type(idati, -1, "MACRO_VARIABLE_ATTRIBUTE");

#if IDA_SDK_VERSION >= 900
tinfo_t tinfo;
if (tinfo.get_named_type(idati, "MACRO_EFI")) {
m_macro_efi_tid = tinfo.force_tid();
}
#endif
m_macro_efi_tid = import_type(idati, -1, "MACRO_EFI");
m_macro_var_attr_tid = import_type(idati, -1, "MACRO_VARIABLE_ATTRIBUTE");

#ifdef HEX_RAYS
for (auto idx = 0; idx < get_entry_qty(); idx++) {
Expand Down Expand Up @@ -436,14 +431,8 @@ class efi_analyser_arm_t : public efi_analyser_t {
import_type(idati, -1, "EFI_HANDLE");
import_type(idati, -1, "EFI_RUNTIME_SERVICES");
import_type(idati, -1, "EFI_SYSTEM_TABLE");
import_type(idati, -1, "MACRO_VARIABLE_ATTRIBUTE");

#if IDA_SDK_VERSION >= 900
tinfo_t tinfo;
if (tinfo.get_named_type(idati, "MACRO_EFI")) {
m_macro_efi_tid = tinfo.force_tid();
}
#endif
m_macro_efi_tid = import_type(idati, -1, "MACRO_EFI");
m_macro_var_attr_tid = import_type(idati, -1, "MACRO_VARIABLE_ATTRIBUTE");
}

~efi_analyser_arm_t() {
Expand All @@ -469,6 +458,7 @@ class efi_analyser_arm_t : public efi_analyser_t {
ea_list_t m_rt_list_arm;

tid_t m_macro_efi_tid;
tid_t m_macro_var_attr_tid;

bool get_protocol(ea_t address, uint32_t p_reg, std::string service_name);
bool set_enums_repr(ea_t ea, insn_t insn);
Expand Down
15 changes: 14 additions & 1 deletion efiXplorer/efi_analysis_x86.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2372,9 +2372,22 @@ bool efi_analysis::efi_analyser_t::analyse_variable_service(
{0x00000008, "HARDWARE_ERROR_RECORD"},
{0x00000010, "AUTHENTICATED_WRITE_ACCESS"}};

addr = args[2]; // attributes argument
addr = args[2]; // Attributes argument
decode_insn(&insn, addr);

if (insn.itype == NN_mov && insn.ops[1].type == o_imm) {
// attempt to annotate Attributes argument
//
// mostly we see such code where op_enum() does not
// help, because operand is not an immediate value:
// mov r9d, X ; DataSize
// lea r8d, [r9+Y] ; Attributes (X + Y)
//
// however, it will work when we encounter:
// mov r8d, X ; Attributes
op_enum(addr, 1, m_macro_var_attr_tid, 0);
}

if (insn.itype == NN_xor && insn.ops[0].type == o_reg &&
insn.ops[1].type == o_reg && insn.ops[0].reg == insn.ops[1].reg &&
insn.ops[0].reg == R_R8) {
Expand Down