-
Notifications
You must be signed in to change notification settings - Fork 163
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.
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
PE: Add tests for TLS parser and characteristics constants #426
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
@m4b Hi there, I'd like to get review for this PR as well, it's ready to go. :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thank you for adding tests! seriously. however, I'm getting a bit concerned with the amount of pe bins coming in, and their size; thinking out loud here:
- can we lower the size of some of the binaries? 110KB feels excessive for a simple repro test
- is it possible to rewrite some of the binaries as simple C files, compile them, and then if necessary manipulate them so they exhibit the behavior required for testing?
- alternatively, if only a small subsection is being tested, perhaps we can just do
&'static [u8]
as an inline byte sequence we expect to parse/not parse correctly, and so unit test just that section of PE you're interested in testing?
On the matter of testing in goblin, there was some talk a long time ago to add an external binary suite so that they wouldn't have to be checked in, but i'm not sure how feasible that is, etc., and what it looks like in practice.
anyway, also I assume we/you have the right to upload these binaries, e.g, they're not some proprietary binary that you alone have access to, or etc. they look like simple rust programs compiled on windows or whatever, so I assume so, but it's good practice to ask :)
anyway, if we can trim down some of the test sizes, I think this is more or less good to go, thank you for adding all of this!
src/pe/tls.rs
Outdated
// Each callback is an VA so convert it to RVA | ||
let callback_rva = callback as usize - image_base; | ||
let callback_rva = callback.wrapping_sub(image_base as u64) as usize; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
with the check above, isn't wrapping sub unnecessary? perhaps add a comment noting this in case it's refactored, but with the check above callback - image_base cannot wrap iiuc, since callback >= image_base?
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that was my fault. I was not smart enough to consider usize
v. u64
behaves differently in the x86 binaries.
For this case, it tries to subtract the value from the value where upper 32-bits were mistakenly trimmed. by using wrapping_sub
it is casted correctly (64-bit var to 32-bit var), but without it, it casts to the 32-bit var and then 64-bit var, then subtract with overflow. Makes sense.
I'm going to fix this.
fn main() {
println!("usize {}", core::mem::size_of::<usize>());
println!(" u64 {}", core::mem::size_of::<u64>());
}
cargo run --target x86_64-pc-windows-msvc
usize 8
u64 8
cargo run --target i686-pc-windows-msvc
usize 4
u64 8
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've been thinking about, somewhat related, image_base
in goblin should be u64
instead of usize
to be compatible with both x64 and x86 samples on each host builds.
Target | Sizeof usize |
Sizeof u64 |
---|---|---|
x86 (32-bit) | 4 bytes (32-bit) | 8 bytes (64-bit) |
x64 (64-bit) | 8 bytes (64-bit) | 8 bytes (64-bit) |
That's implemented without aware of x86 host compatibility. Perhaps fixed in 0.10 but would likely to be subject to breaking change.
TODO: maybe we should improve our CI as well.
Decreased size of test binaries (~9KB), here's the practical considerations for further reproduce: # .cargo/config.toml
[target.x86_64-pc-windows-msvc]
# Required by `build-std-features=panic_immediate_abort`
rustflags = ["-C", "panic=abort"]
# LLD links much smarter, and without POGO/rich header
linker = "rust-lld.exe"
[unstable]
# Do not use precompiled, fully compile them to apply our optimizations
build-std = ["core", "std", "panic_abort"]
# Entiely strip format from panic handlers
build-std-features = ["panic_immediate_abort"] # Cargo.toml
[profile.release]
panic = "abort"
lto = true
opt-level = "s"
codegen-units = 1
strip = true // build.rs
fn main() {
// `no_main` requires this
println!("cargo:rustc-link-arg=/SUBSYSTEM:CONSOLE");
// Do not include default manifest (no resource)
println!("cargo:rustc-link-arg=/MANIFEST:NO");
// Do not generate base relocations (DO NOT do this for production)
println!("cargo:rustc-link-arg=/FIXED");
// No debug directory (strip=true do but in case)
println!("cargo:rustc-link-arg=/DEBUG:NONE");
// No unwind info (DO NOT do this for production; without `.pdata`)
println!("cargo:rustc-link-arg=/SAFESEH");
} // main.rs
#![no_std]
#![no_main]
use core::panic::PanicInfo;
#[panic_handler]
fn panic(_info: &PanicInfo) -> ! {
loop {}
}
// Force marker symbol to be included
// Tell the linker that TLS is being linked to the binary
// Exclusive for x86-64, but `_tls_used` is intentional, rather than `__tls_used`
#[link_section = ".drectve"]
#[used]
static DIRECTIVE: [u8; 19] = *b"/INCLUDE:_tls_used ";
#[link_section = ".CRT$XLB"]
#[used]
pub static TLS_CALLBACK: unsafe extern "system" fn(*mut i8, u32, *mut i8) = tls_callback;
#[inline(never)]
pub extern "system" fn tls_callback(_: *mut i8, _: u32, _: *mut i8) {}
// Required by `no_main`.
// This is the direct entry point. Do not let Rust generate CRT entry for this binary.
#[no_mangle]
extern "system" fn main() {} |
C/C++ project can make the binaries much smaller (~1KB), here's yet another practical considerations: // main.cc
#include <Windows.h>
EXTERN_C unsigned int _tls_index{};
static void NTAPI tls_callback(PVOID, DWORD, PVOID) {}
#pragma comment(linker, "/INCLUDE:_tls_used")
#pragma comment(linker, "/INCLUDE:_tls_callback")
#pragma data_seg(".tls")
int _tls_start = 0;
#pragma const_seg()
#pragma data_seg(".tls$ZZZ")
int _tls_end = 0;
#pragma const_seg()
#pragma data_seg(".CRT$XLA")
int __xl_a = 0;
#pragma const_seg()
#pragma data_seg(".CRT$XLZ")
int __xl_z = 0;
#pragma const_seg()
#pragma const_seg(".CRT$XLB")
EXTERN_C const PIMAGE_TLS_CALLBACK _tls_callback[] = { &tls_callback, 0 };
#pragma const_seg()
EXTERN_C IMAGE_TLS_DIRECTORY _tls_used = { (ULONG64)&_tls_start, (ULONG64)&_tls_end, (ULONG64)&_tls_index, (ULONG64)&_tls_callback, 0, (ULONG32)0 };
int main() { return 0; } Compiler and linker flags (use Clang/LLD; LLVM toolchains in Visual Studio): <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<BufferSecurityCheck>false</BufferSecurityCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>false</GenerateDebugInformation>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<EntryPointSymbol>main</EntryPointSymbol>
<FixedBaseAddress>true</FixedBaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
<AdditionalOptions>/MERGE:.data=.text /MERGE:.CRT=.text /MERGE:.tls=.text %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
</Project> |
@m4b Thank you very much for awesome review! All chenge requests addressed. Would you able to take a look for my solution?
Surely I did! Each binaries now has size of less than 1KB.
Unfortunately, it is not feasible for this TLS tests. Since TLS takes virtual addresses, not the relative virtual addresses, it takes dependencies to the PE header not only for sections. Maybe somehow we can spread out the impls as possible as it can and feed them small pieces of byte slices, if even 1KB is not ideal.
I thought this as well. lief-project/LIEF do the similar thing and we definitely should have it. I guess the best way to do that is to have an external repository (something like That is absolutely worth try out, as well as some third-party multi-binary repositories such as iosifache/DikeDataset to stress tests. I am doing that way on my local before submitting new significant features like #431/#432 and I had good experience doing that way, found multiple hidden bug sometimes caused by human errors. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is great, thank you so much for massively reducing the binaries; I would also prefer to have the C source code checked in along with the xml file too, just for future reference in case anyone wants to repro, etc., this is very useful. I'll wait a day or two for you to push these to this patch here, and then merge asap, thank you again for pushing this!
@m4b Thank you for your review! I've added the CMake/VisualStudio project along with the CXX source under |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thank you!
ImageTlsDirectory::characteristics
.TlsData
, including regression test for Fail to parse PE files compiled by Rust #424.Footnotes
This is something odd; I could not repricate the same on my local dev env. Perhaps its 32 v. 64 host binary issue.Solved in here. ↩