From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 23 Apr 2018 19:42:26 +0000 (-0700)
Subject: bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6579)
X-Git-Tag: v3.7.0b4~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75a3e3d5bc0be1ce41289b661e7c53039cf3d5ba;p=python

bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6579)

Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some
reserved signal numbers between 1 and NSIG.  The `range(1, NSIG)` idiom
is commonly used to select all signals for blocking with `pthread_sigmask`.
So we ignore the sigaddset() return value until we expose sigfillset()
to provide a better idiom.
(cherry picked from commit 25038ecfb665bef641abf8cb61afff7505b0e008)

Co-authored-by: Antoine Pitrou <pitrou@free.fr>
---

diff --git a/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst
new file mode 100644
index 0000000000..d1a4e56d04
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst
@@ -0,0 +1 @@
+Fix multiprocessing regression on newer glibcs
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index b553eedc0f..aa224fd78c 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -759,7 +759,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
     int result = -1;
     PyObject *iterator, *item;
     long signum;
-    int err;
 
     sigemptyset(mask);
 
@@ -781,11 +780,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
         Py_DECREF(item);
         if (signum == -1 && PyErr_Occurred())
             goto error;
-        if (0 < signum && signum < NSIG)
-            err = sigaddset(mask, (int)signum);
-        else
-            err = 1;
-        if (err) {
+        if (0 < signum && signum < NSIG) {
+            /* bpo-33329: ignore sigaddset() return value as it can fail
+             * for some reserved signals, but we want the `range(1, NSIG)`
+             * idiom to allow selecting all valid signals.
+             */
+            (void) sigaddset(mask, (int)signum);
+        }
+        else {
             PyErr_Format(PyExc_ValueError,
                          "signal number %ld out of range", signum);
             goto error;