PR10653: don't corrupt signal structs in itrace on rawhide utrace

* runtime/itrace.c (usr_itrace_report_signal): On modern utrace,
  must check/propagate utrace_signal_action().

diff --git a/runtime/itrace.c b/runtime/itrace.c
index 03e1e40356fa07e75ac4d2bd50c65703a3c0881c..f2ed86f2cf7bb3fdff7718e2bed3558d19e15bf4 100644 (file)
--- a/runtime/itrace.c
+++ b/runtime/itrace.c
@@ -131,9 +131,16 @@ static u32 usr_itrace_report_signal(u32 action,
 
        ui = rcu_dereference(engine->data);
        WARN_ON(!ui);
-       
-       if (info->si_signo != SIGTRAP || !ui)
-               return UTRACE_RESUME;
+
+#if defined(UTRACE_ORIG_VERSION) 
+        if (info->si_signo != SIGTRAP || !ui)
+         return UTRACE_RESUME;
+#else
+       if (utrace_signal_action(action) == UTRACE_SIGNAL_HANDLER ||
+            utrace_signal_action(action) == UTRACE_SIGNAL_REPORT ||
+           info->si_signo != SIGTRAP || !ui)
+         return UTRACE_RESUME | utrace_signal_action(action);
+#endif
 
 #if defined(UTRACE_ORIG_VERSION) && defined(CONFIG_PPC)
        /* Because of a ppc utrace bug, we need to stop the task here.