ltp: sigprocmask fix

1. change signal/sig_procmask.c and pthread/pthread_sigmask.c together 2. clear signals unconditionally Signed-off-by: guanyi <[email protected]>
apache · Aug 1, 2023 · 55a727b · 55a727b
1 parent f8ce0cd
commit 55a727b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/sched/pthread/pthread_sigmask.c b/sched/pthread/pthread_sigmask.c
@@ -64,6 +64,19 @@
 
 int pthread_sigmask(int how, FAR const sigset_t *set, FAR sigset_t *oset)
 {
-  int ret = nxsig_procmask(how, set, oset);
+  sigset_t nset;
+  int ret;
+
+  /* SIGKILL and SIGSTOP should not be added to signal mask */
+
+  if (set != NULL)
+    {
+      nset = *set;
+      nxsig_delset(&nset, SIGKILL);
+      nxsig_delset(&nset, SIGSTOP);
+      set = &nset;
+    }
+
+  ret = nxsig_procmask(how, set, oset);
   return ret < 0 ? -ret : OK;
 }
diff --git a/sched/signal/sig_procmask.c b/sched/signal/sig_procmask.c
@@ -187,8 +187,19 @@ int nxsig_procmask(int how, FAR const sigset_t *set, FAR sigset_t *oset)
 
 int sigprocmask(int how, FAR const sigset_t *set, FAR sigset_t *oset)
 {
+  sigset_t nset;
   int ret;
 
+  /* SIGKILL and SIGSTOP should not be added to signal mask */
+
+  if (set != NULL)
+    {
+      nset = *set;
+      nxsig_delset(&nset, SIGKILL);
+      nxsig_delset(&nset, SIGSTOP);
+      set = &nset;
+    }
+
   /* Let nxsig_procmask do all of the work */
 
   ret = nxsig_procmask(how, set, oset);