diff --git a/compiler-rt/lib/msan/msan_interceptors.cpp b/compiler-rt/lib/msan/msan_interceptors.cpp
--- a/compiler-rt/lib/msan/msan_interceptors.cpp
+++ b/compiler-rt/lib/msan/msan_interceptors.cpp
@@ -996,6 +996,7 @@
   sigaction_cb cb =
       (sigaction_cb)atomic_load(&sigactions[signo], memory_order_relaxed);
   cb(signo, si, uc);
+  CHECK_UNPOISONED(uc, ucontext_t_sz(uc));
 }
 
 static void read_sigaction(const __sanitizer_sigaction *act) {
diff --git a/compiler-rt/test/msan/Linux/signal_mcontext2.cpp b/compiler-rt/test/msan/Linux/signal_mcontext2.cpp
new file mode 100644
--- /dev/null
+++ b/compiler-rt/test/msan/Linux/signal_mcontext2.cpp
@@ -0,0 +1,27 @@
+// RUN: %clangxx_msan -fsanitize-memory-track-origins=2 -O1 %s -o %t && not %run %t 2>&1 | FileCheck %s
+
+#include <pthread.h>
+#include <signal.h>
+#include <ucontext.h>
+
+void handler(int sig, siginfo_t *info, void *uctx) {
+  volatile int uninit;
+  auto *mctx = &static_cast<ucontext_t *>(uctx)->uc_mcontext;
+  auto *fpregs = mctx->fpregs;
+  if (fpregs && fpregs->__glibc_reserved1[12] == FP_XSTATE_MAGIC1)
+    reinterpret_cast<_xstate *>(mctx->fpregs)->ymmh.ymmh_space[0] = uninit;
+  else
+    mctx->gregs[REG_RAX] = uninit;
+}
+
+int main(int argc, char **argv) {
+  struct sigaction act = {};
+  act.sa_sigaction = handler;
+  act.sa_flags = SA_SIGINFO;
+  sigfillset(&act.sa_mask);
+  sigaction(SIGPROF, &act, 0);
+  pthread_kill(pthread_self(), SIGPROF);
+  return 0;
+}
+
+// CHECK: WARNING: MemorySanitizer: