Skip to content

Conversation

@devnexen
Copy link
Member

@devnexen devnexen commented Mar 8, 2025

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Mar 8, 2025

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: David CARLIER (devnexen)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/130423.diff

2 Files Affected:

  • (modified) compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp (+26)
  • (modified) compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp (+14)
diff --git a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
index cd57107450a47..6848f2c346761 100644
--- a/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_interceptors_posix.cpp
@@ -1361,6 +1361,31 @@ INTERCEPTOR(int, execve, const char *filename, char *const argv[],
   return REAL(execve)(filename, argv, envp);
 }
 
+#if SANITIZER_GLIBC
+INTERCEPTOR(int, clone, int (*f)(void *), void *stack, int flags, void *arg,
+            ...) {
+  __rtsan_notify_intercepted_call("clone");
+
+  if ((flags & CLONE_PIDFD) || (flags & CLONE_SETTLS) ||
+      (flags & CLONE_PARENT_SETTID) || (flags & CLONE_CHILD_SETTID) ||
+      (flags & CLONE_CHILD_CLEARTID)) {
+    va_list args;
+    va_start(args, arg);
+    pid_t *parent = va_arg(args, pid_t *);
+    void *tls = va_arg(args, void *);
+    pid_t *child = va_arg(args, pid_t *);
+    va_end(args);
+
+    return REAL(clone)(f, stack, flags, arg, parent, tls, child);
+  }
+
+  return REAL(clone)(f, stack, flags, arg);
+}
+#define RTSAN_MAYBE_INTERCEPT_CLONE INTERCEPT_FUNCTION(clone)
+#else
+#define RTSAN_MAYBE_INTERCEPT_CLONE
+#endif
+
 #if SANITIZER_INTERCEPT_PROCESS_VM_READV
 INTERCEPTOR(ssize_t, process_vm_readv, pid_t pid, const struct iovec *local_iov,
             unsigned long liovcnt, const struct iovec *remote_iov,
@@ -1595,6 +1620,7 @@ void __rtsan::InitializeInterceptors() {
 
   INTERCEPT_FUNCTION(fork);
   INTERCEPT_FUNCTION(execve);
+  RTSAN_MAYBE_INTERCEPT_CLONE;
 
   RTSAN_MAYBE_INTERCEPT_PROCESS_VM_READV;
   RTSAN_MAYBE_INTERCEPT_PROCESS_VM_WRITEV;
diff --git a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
index 47bcafff51a4d..0fc7b9ae19bb9 100644
--- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
+++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors_posix.cpp
@@ -1245,6 +1245,20 @@ TEST_F(PthreadRwlockTest, PthreadRwlockWrlockSurvivesWhenNonRealtime) {
   ExpectNonRealtimeSurvival(Func);
 }
 
+#if SANITIZER_GLIBC
+TEST(TestRtsanInterceptors, CloneDiesWhenRealtime) {
+  std::vector<char> buf;
+  buf.resize(1024 * 1024);
+  auto Call = [](void *a) { return 0; };
+  auto Func = [&buf, &Call]() {
+    clone(Call, buf.data() + buf.size(), 0, nullptr);
+  };
+
+  ExpectRealtimeDeath(Func, "clone");
+  ExpectNonRealtimeSurvival(Func);
+}
+#endif
+
 /*
     Sockets
 */

...) {
__rtsan_notify_intercepted_call("clone");

if ((flags & CLONE_PIDFD) || (flags & CLONE_SETTLS) ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This branch does not appear to be under test - is there any reason why that is difficult?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry just saw your comment now, will add something.

@devnexen
Copy link
Member Author

@cjappl ping :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants