SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Asan Fix (#490)

Browse Source 
* fix

* fmt
This commit is contained in:
Dongjia Zhang 2022-01-24 17:17:19 +09:00 committed by GitHub
parent 14959c7f9c
commit 2730515c46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libafl_frida/src/asan/asan_rt.rs
View File

@ -2295,6 +2295,14 @@ impl AsanRuntime {
X86Register::Rip => { X86Register::Rip => {
writer.put_mov_reg_address(X86Register::Rdi, true_rip); writer.put_mov_reg_address(X86Register::Rdi, true_rip);
} }
X86Register::Rsp => {
// In this case rsp clobbered
writer.put_lea_reg_reg_offset(
X86Register::Rdi,
X86Register::Rsp,
redzone_size + 0x8 * 6,
);
}
_ => { _ => {
writer.put_mov_reg_reg(X86Register::Rdi, basereg.unwrap()); writer.put_mov_reg_reg(X86Register::Rdi, basereg.unwrap());
} }
@ -2313,6 +2321,14 @@ impl AsanRuntime {
// In this case rdi is already clobbered, so we want it from the stack (we pushed rdi onto stack before!) // In this case rdi is already clobbered, so we want it from the stack (we pushed rdi onto stack before!)
writer.put_mov_reg_reg_offset_ptr(X86Register::Rsi, X86Register::Rsp, -0x28); writer.put_mov_reg_reg_offset_ptr(X86Register::Rsi, X86Register::Rsp, -0x28);
} }
X86Register::Rsp => {
// In this case rsp is also clobbered
writer.put_lea_reg_reg_offset(
X86Register::Rsi,
X86Register::Rsp,
redzone_size + 0x8 * 6,
);
}
_ => { _ => {
writer.put_mov_reg_reg(X86Register::Rsi, indexreg.unwrap()); writer.put_mov_reg_reg(X86Register::Rsi, indexreg.unwrap());
} }