From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 12 Sep 2017 11:12:40 +0000 (+0200)
Subject: utrace: Deliver signals to traced processes
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b5d53c6c683ee73b5d494b5d0750d1deca7b749f;p=oweals%2Fprocd.git

utrace: Deliver signals to traced processes

Without this change, traced processes do not receive any signal,
because all the signals are "eaten" by the tracer.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
---

diff --git a/trace/trace.c b/trace/trace.c
index 4c25a4f..cad2d37 100644
--- a/trace/trace.c
+++ b/trace/trace.c
@@ -148,6 +148,7 @@ static void print_syscalls(int policy, const char *json)
 static void tracer_cb(struct uloop_process *c, int ret)
 {
 	struct tracee *tracee = container_of(c, struct tracee, proc);
+	int inject_signal = 0;
 
 	if (WIFSTOPPED(ret)) {
 		if (WSTOPSIG(ret) & 0x80) {
@@ -174,8 +175,13 @@ static void tracer_cb(struct uloop_process *c, int ret)
 			uloop_process_add(&child->proc);
 			if (debug)
 				fprintf(stderr, "Tracing new child %d\n", child->proc.pid);
+		} else {
+			inject_signal = WSTOPSIG(ret);
+			if (debug)
+				fprintf(stderr, "Injecting signal %d into pid %d\n",
+					inject_signal, tracee->proc.pid);
 		}
-	} else if (WIFEXITED(ret)) {
+	} else if (WIFEXITED(ret) || (WIFSIGNALED(ret) && WTERMSIG(ret))) {
 		if (tracee == &tracer) {
 			uloop_end(); /* Main process exit */
 		} else {
@@ -186,7 +192,7 @@ static void tracer_cb(struct uloop_process *c, int ret)
 		return;
 	}
 
-	ptrace(PTRACE_SYSCALL, c->pid, 0, 0);
+	ptrace(PTRACE_SYSCALL, c->pid, 0, inject_signal);
 	uloop_process_add(c);
 }