From f4a14f672bce537e9101ffc18628a3aba6c04bd4 Mon Sep 17 00:00:00 2001
From: Alberto Miranda <alberto.miranda@bsc.es>
Date: Mon, 30 Mar 2020 13:56:43 +0000
Subject: [PATCH] Add syscall arguments to clone hooks

---
 include/libsyscall_intercept_hook_point.h | 10 +++++---
 src/intercept.c                           | 29 +++++++++++++++++++----
 test/test_clone_thread_preload.c          | 12 +++++++++-
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/include/libsyscall_intercept_hook_point.h b/include/libsyscall_intercept_hook_point.h
index 2fe7d57c..cdac0e4f 100644
--- a/include/libsyscall_intercept_hook_point.h
+++ b/include/libsyscall_intercept_hook_point.h
@@ -56,9 +56,13 @@ extern int (*intercept_hook_point)(long syscall_number,
 			long arg2, long arg3,
 			long arg4, long arg5,
 			long *result);
-
-extern void (*intercept_hook_point_clone_child)(void);
-extern void (*intercept_hook_point_clone_parent)(long pid);
+extern void (*intercept_hook_point_clone_child)(
+			unsigned long flags, void *child_stack,
+			int *ptid, int *ctid, long newtls);
+extern void (*intercept_hook_point_clone_parent)(
+			unsigned long flags, void *child_stack,
+			int *ptid, int *ctid, long newtls,
+			long returned_pid);
 
 /*
  * syscall_no_intercept - syscall without interception
diff --git a/src/intercept.c b/src/intercept.c
index 41fd95d7..454f654d 100644
--- a/src/intercept.c
+++ b/src/intercept.c
@@ -67,9 +67,16 @@ int (*intercept_hook_point)(long syscall_number,
 			long *result)
 	__attribute__((visibility("default")));
 
-void (*intercept_hook_point_clone_child)(void)
+void (*intercept_hook_point_clone_child)(
+		unsigned long flags, void *child_stack,
+		int *ptid, int *ctid,
+		long newtls)
 	__attribute__((visibility("default")));
-void (*intercept_hook_point_clone_parent)(long)
+
+void (*intercept_hook_point_clone_parent)(
+		unsigned long flags, void *child_stack,
+		int *ptid, int *ctid,
+		long newtls, long returned_pid)
 	__attribute__((visibility("default")));
 
 bool debug_dumps_on;
@@ -670,12 +677,26 @@ intercept_routine(struct context *context)
 struct wrapper_ret
 intercept_routine_post_clone(struct context *context)
 {
+	struct syscall_desc desc;
+	get_syscall_in_context(context, &desc);
+
 	if (context->rax == 0) {
 		if (intercept_hook_point_clone_child != NULL)
-			intercept_hook_point_clone_child();
+			intercept_hook_point_clone_child(
+				(unsigned long)desc.args[0],
+				(void *)desc.args[1],
+				(int *)desc.args[2],
+				(int *)desc.args[3],
+				desc.args[4]);
 	} else {
 		if (intercept_hook_point_clone_parent != NULL)
-			intercept_hook_point_clone_parent(context->rax);
+			intercept_hook_point_clone_parent(
+				(unsigned long)desc.args[0],
+				(void *)desc.args[1],
+				(int *)desc.args[2],
+				(int *)desc.args[3],
+				desc.args[4],
+				context->rax);
 	}
 
 	return (struct wrapper_ret){.rax = context->rax, .rdx = 1 };
diff --git a/test/test_clone_thread_preload.c b/test/test_clone_thread_preload.c
index c7663a28..bff239e7 100644
--- a/test/test_clone_thread_preload.c
+++ b/test/test_clone_thread_preload.c
@@ -96,8 +96,18 @@ hook(long syscall_number,
  * of the clone syscall.
  */
 static void
-hook_child(void)
+hook_child(unsigned long clone_flags,
+			void *child_stack,
+			int *ptid,
+			int *ctid,
+			long newtls)
 {
+	(void) clone_flags;
+	(void) child_stack;
+	(void) ptid;
+	(void) ctid;
+	(void) newtls;
+
 	static const char msg[] = "clone_hook_child called\n";
 
 	assert(flags != -1);