From f49822d82abb0ef1eb21ca7700e37bc5119f01ab Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Wed, 31 Jul 2019 17:01:31 +0200
Subject: [PATCH] Test int3

---
 src/main.rs | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 2962730..eb19619 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -176,8 +176,10 @@ pub fn ptrace() -> Result<(), String> {
                 // aaaaand yet again...
                 mov rax, 37 // SYS_KILL
                 syscall
+                // test int3
+                int3
 
-                mov rax, 158 // SYS_KILL
+                mov rax, 200 // SYS_GETGID
                 syscall
 
                 // Test behavior if tracer aborts a breakpoint before it's reached
@@ -372,10 +374,20 @@ pub fn ptrace() -> Result<(), String> {
         }
     }
 
-    println!("Testing ignoring signals");
-    assert_eq!(e(e(next(&mut tracer, Flags::STOP_SIGNAL))?.regs.get_int())?.rax, syscall::SYS_KILL);
-    assert_eq!(e(e(next(&mut tracer, Flags::FLAG_IGNORE | Flags::STOP_PRE_SYSCALL))?.regs.get_int())?.rax, syscall::SYS_YIELD);
-    assert_eq!(e(e(next(&mut tracer, Flags::STOP_POST_SYSCALL))?.regs.get_int())?.rax, 0);
+    println!("Test ignoring signal");
+    let event = e(tracer.next(Flags::STOP_SIGNAL | Flags::STOP_POST_SYSCALL))?;
+    assert_eq!(e(tracer.regs.get_int())?.rax, syscall::SYS_KILL);
+    assert_eq!(event.cause, Flags::STOP_SIGNAL);
+    match event.data {
+        EventData::StopSignal(signal, _) => assert_eq!(signal, syscall::SIGUSR1),
+        ref e => return Err(format!("Wrong event type: {:?}", e))
+    }
+
+    println!("Test ignoring int3");
+    let event = e(tracer.next(Flags::FLAG_IGNORE | Flags::STOP_BREAKPOINT))?;
+    assert_eq!(event.cause, Flags::STOP_BREAKPOINT);
+    assert_eq!(e(e(next(&mut tracer, Flags::FLAG_IGNORE | Flags::STOP_PRE_SYSCALL))?.regs.get_int())?.rax, syscall::SYS_GETGID);
+    e(next(&mut tracer, Flags::STOP_POST_SYSCALL))?;
 
     // Activate nonblock
     let mut tracer = e(tracer.nonblocking())?;