Skip to content

Register ELF and Mach-O loader settings as per-file load settings instead of global #8425

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

Open
bpotchik wants to merge 1 commit into
base: dev
Choose a base branch
from
+49 −46
Open

Register ELF and Mach-O loader settings as per-file load settings instead of global #8425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 35 additions & 35 deletions view/elf/elfview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,6 @@ void BinaryNinja::InitElfViewType()
static ElfViewType type;
BinaryViewType::Register(&type);
g_elfViewType = &type;

Ref<Settings> settings = Settings::Instance();
settings->RegisterSetting("files.elf.maxSectionHeaderCount",
R"({
"title" : "Maximum ELF Section Header Count",
"type" : "number",
"default" : 100,
"minValue" : 0,
"maxValue" : 65536,
"description" : "Maximum number of entries to include in section header array",
"ignore" : ["SettingsProjectScope"]
})");

settings->RegisterSetting("files.elf.detectARMBE8Binary",
R"({
"title" : "Enable ARM BE8 binary detection",
"type" : "boolean",
"default" : true,
"description" : "Enable ARM BE8 binary detection for mixed little/big endianness for code/data",
"ignore" : ["SettingsProjectScope", "SettingsResourceScope"]
})");

settings->RegisterSetting("files.elf.overrideX86Endianness",
R"~({
"title" : "Override x86 ELF endianness",
"type" : "boolean",
"default" : true,
"description" : "Automatically override endianness to little-endian for x86/x86_64 ELF files (useful for obfuscated binaries)",
"ignore" : ["SettingsProjectScope", "SettingsResourceScope"]
})~");

}


Expand Down Expand Up @@ -2247,8 +2216,8 @@ bool ElfView::Init()
if (m_sectionHeaderCount != 0)
{
uint64_t configuredSectionCount = 100;
if (viewSettings && viewSettings->Contains("files.elf.maxSectionHeaderCount"))
configuredSectionCount = viewSettings->Get<uint64_t>("files.elf.maxSectionHeaderCount", this);
if (settings && settings->Contains("loader.elf.maxSectionHeaderCount"))
configuredSectionCount = settings->Get<uint64_t>("loader.elf.maxSectionHeaderCount", this);
uint64_t sectionCount = std::min<uint64_t>(m_sectionHeaderCount, configuredSectionCount);
if (GetAddressForDataOffset(m_sectionHeaderOffset, addr))
{
Expand Down Expand Up @@ -2985,7 +2954,10 @@ uint64_t ElfView::ParseHeaders(BinaryView* data, ElfIdent& ident, ElfCommonHeade
endianness = headerEndianness;

// Check for automatic x86 endianness override
bool overrideX86Endianness = Settings::Instance()->Get<bool>("files.elf.overrideX86Endianness");
Ref<Settings> loadSettings = data->GetLoadSettings(g_elfViewType->GetName());
bool overrideX86Endianness = true;
if (loadSettings && loadSettings->Contains("loader.elf.overrideX86Endianness"))
overrideX86Endianness = loadSettings->Get<bool>("loader.elf.overrideX86Endianness");
if (overrideX86Endianness)
{
// Peek at e_machine field (2 bytes at offset 0x12) with little-endian interpretation
Expand Down Expand Up @@ -3134,7 +3106,9 @@ uint64_t ElfView::ParseHeaders(BinaryView* data, ElfIdent& ident, ElfCommonHeade
// retrieve architecture
// FIXME: Architecture registration methods should perhaps be virtual and take the raw data, or some additional opaque information.

bool checkForARMBE8 = Settings::Instance()->Get<bool>("files.elf.detectARMBE8Binary");
bool checkForARMBE8 = true;
if (loadSettings && loadSettings->Contains("loader.elf.detectARMBE8Binary"))
checkForARMBE8 = loadSettings->Get<bool>("loader.elf.detectARMBE8Binary");
if (checkForARMBE8)
endianness = ((commonHeader.arch == EM_ARM) && (header.flags & EF_ARM_BE8)) ? BigEndian : endianness;

Expand Down Expand Up @@ -3201,6 +3175,32 @@ Ref<Settings> ElfViewType::GetLoadSettingsForData(BinaryView* data)
settings->UpdateProperty(override, "readOnly", false);
}

// register additional settings
settings->RegisterSetting("loader.elf.maxSectionHeaderCount",
R"({
"title" : "Maximum ELF Section Header Count",
"type" : "number",
"default" : 100,
"minValue" : 0,
"maxValue" : 65536,
"description" : "Maximum number of entries to include in section header array"
})");

settings->RegisterSetting("loader.elf.detectARMBE8Binary",
R"({
"title" : "Enable ARM BE8 binary detection",
"type" : "boolean",
"default" : true,
"description" : "Enable ARM BE8 binary detection for mixed little/big endianness for code/data"
})");

settings->RegisterSetting("loader.elf.overrideX86Endianness",
R"~({
"title" : "Override x86 ELF endianness",
"type" : "boolean",
"default" : true,
"description" : "Automatically override endianness to little-endian for x86/x86_64 ELF files (useful for obfuscated binaries)"
})~");

return settings;
}
Expand Down
25 changes: 14 additions & 11 deletions view/macho/machoview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,16 +381,6 @@ void BinaryNinja::InitMachoViewType()
static MachoViewType type;
BinaryViewType::Register(&type);
g_machoViewType = &type;

Settings::Instance()->RegisterSetting("loader.macho.maxRebaseBindEntriesMultiplier",
R"~({
"title" : "Mach-O Rebase/Bind Table Entry Count Limit Multiplier",
"type" : "number",
"default" : 1.0,
"minValue" : 0.01,
"maxValue" : 10.0,
"description" : "Multiplier applied to the maximum number of rebase/bind entries permitted per table, which is derived from the size of the Mach-O slice divided by its pointer size"
})~");
}

MachoView::MachoView(const string& typeName, BinaryView* data, bool parseOnly): BinaryView(typeName, data->GetFile(), data),
Expand Down Expand Up @@ -2994,7 +2984,10 @@ uint64_t MachoView::GetRebaseBindEntryLimit()
? (GetParentView()->GetLength() - m_universalImageOffset)
: 0;
uint64_t structuralLimit = sliceSize / m_addressSize;
double entryLimitMultiplier = Settings::Instance()->Get<double>("loader.macho.maxRebaseBindEntriesMultiplier", this);
double entryLimitMultiplier = 1.0;
Ref<Settings> settings = GetLoadSettings(GetTypeName());
if (settings && settings->Contains("loader.macho.maxRebaseBindEntriesMultiplier"))
entryLimitMultiplier = settings->Get<double>("loader.macho.maxRebaseBindEntriesMultiplier", this);
return (uint64_t)(structuralLimit * entryLimitMultiplier);
}

Expand Down Expand Up @@ -4045,6 +4038,16 @@ Ref<Settings> MachoViewType::GetLoadSettingsForData(BinaryView* data)
"description" : "Add function starts sourced from the Function Starts table to the core for analysis."
})");

settings->RegisterSetting("loader.macho.maxRebaseBindEntriesMultiplier",
R"({
"title" : "Mach-O Rebase/Bind Table Entry Count Limit Multiplier",
"type" : "number",
"default" : 1.0,
"minValue" : 0.01,
"maxValue" : 10.0,
"description" : "Multiplier applied to the maximum number of rebase/bind entries permitted per table, which is derived from the size of the Mach-O slice divided by its pointer size"
})");

if (viewRef->GetSectionByName("__thread_starts"))
{
settings->RegisterSetting("loader.macho.rebaseThreadStarts",
Expand Down