From 8a57361e8419cd62022e5547b62c6311cee21b46 Mon Sep 17 00:00:00 2001
From: Lukas Seidel <pr0me@users.noreply.github.com>
Date: Thu, 2 Dec 2021 10:28:17 +0100
Subject: [PATCH] dump_registers and write_crash for armv7 (#393)

* dump_registers and write_crash for armv7

* fmt
---
 libafl/src/bolts/minibsod.rs        | 43 +++++++++++++++++++++++++++++
 libafl/src/bolts/os/unix_signals.rs |  4 +++
 2 files changed, 47 insertions(+)

diff --git a/libafl/src/bolts/minibsod.rs b/libafl/src/bolts/minibsod.rs
index 51a70e18a1..f59944fcf9 100644
--- a/libafl/src/bolts/minibsod.rs
+++ b/libafl/src/bolts/minibsod.rs
@@ -68,6 +68,34 @@ pub fn dump_registers<W: Write>(
     Ok(())
 }
 
+/// Write the contens of all important registers
+#[cfg(all(target_os = "linux", target_arch = "arm"))]
+pub fn dump_registers<W: Write>(
+    writer: &mut BufWriter<W>,
+    ucontext: &ucontext_t,
+) -> Result<(), std::io::Error> {
+    write!(writer, "r0 : {:#016x}, ", ucontext.uc_mcontext.arm_r0)?;
+    write!(writer, "r1 : {:#016x}, ", ucontext.uc_mcontext.arm_r1)?;
+    write!(writer, "r2: {:#016x}, ", ucontext.uc_mcontext.arm_r2)?;
+    writeln!(writer, "r3: {:#016x}, ", ucontext.uc_mcontext.arm_r3)?;
+    write!(writer, "r4: {:#016x}, ", ucontext.uc_mcontext.arm_r4)?;
+    write!(writer, "r5: {:#016x}, ", ucontext.uc_mcontext.arm_r5)?;
+    write!(writer, "r6: {:#016x}, ", ucontext.uc_mcontext.arm_r6)?;
+    writeln!(writer, "r7: {:#016x}, ", ucontext.uc_mcontext.arm_r7)?;
+    write!(writer, "r8: {:#016x}, ", ucontext.uc_mcontext.arm_r8)?;
+    write!(writer, "r9: {:#016x}, ", ucontext.uc_mcontext.arm_r9)?;
+    write!(writer, "r10: {:#016x}, ", ucontext.uc_mcontext.arm_r10)?;
+    writeln!(writer, "fp: {:#016x}, ", ucontext.uc_mcontext.arm_fp)?;
+    write!(writer, "ip: {:#016x}, ", ucontext.uc_mcontext.arm_ip)?;
+    write!(writer, "sp: {:#016x}, ", ucontext.uc_mcontext.arm_sp)?;
+    write!(writer, "lr: {:#016x}, ", ucontext.uc_mcontext.arm_lr)?;
+    writeln!(writer, "cpsr: {:#016x}, ", ucontext.uc_mcontext.arm_cpsr)?;
+
+    writeln!(writer, "pc : 0x{:016x} ", ucontext.uc_mcontext.arm_pc)?;
+
+    Ok(())
+}
+
 /// Write the contens of all important registers
 #[cfg(all(target_vendor = "apple", target_arch = "aarch64"))]
 pub fn dump_registers<W: Write>(
@@ -174,6 +202,21 @@ fn write_crash<W: Write>(
     Ok(())
 }
 
+#[cfg(all(target_os = "linux", target_arch = "arm"))]
+fn write_crash<W: Write>(
+    writer: &mut BufWriter<W>,
+    signal: Signal,
+    ucontext: &ucontext_t,
+) -> Result<(), std::io::Error> {
+    writeln!(
+        writer,
+        "Received signal {} at 0x{:016x}, fault address: 0x{:016x}",
+        signal, ucontext.uc_mcontext.arm_pc, ucontext.uc_mcontext.fault_address
+    )?;
+
+    Ok(())
+}
+
 #[cfg(all(target_vendor = "apple", target_arch = "aarch64"))]
 fn write_crash<W: Write>(
     writer: &mut BufWriter<W>,
diff --git a/libafl/src/bolts/os/unix_signals.rs b/libafl/src/bolts/os/unix_signals.rs
index a8b0b1d435..b487f571f2 100644
--- a/libafl/src/bolts/os/unix_signals.rs
+++ b/libafl/src/bolts/os/unix_signals.rs
@@ -18,6 +18,8 @@ use std::ffi::CString;
 pub use libc::c_ulong;
 
 #[cfg(target_arch = "arm")]
+#[allow(non_camel_case_types)]
+#[repr(C)]
 pub struct mcontext_t {
     pub trap_no: c_ulong,
     pub error_code: c_ulong,
@@ -43,6 +45,8 @@ pub struct mcontext_t {
 }
 
 #[cfg(target_arch = "arm")]
+#[allow(non_camel_case_types)]
+#[repr(C)]
 pub struct ucontext_t {
     pub uc_flags: u32,
     pub uc_link: *mut ucontext_t,