Skip to content

Commit b0ca398

Browse files
authored
[3.6] bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (GH-6582)
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 25038ec)
1 parent 8a6f4b4 commit b0ca398

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix multiprocessing regression on newer glibcs

Modules/signalmodule.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
759759
int result = -1;
760760
PyObject *iterator, *item;
761761
long signum;
762-
int err;
763762

764763
sigemptyset(mask);
765764

@@ -781,11 +780,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
781780
Py_DECREF(item);
782781
if (signum == -1 && PyErr_Occurred())
783782
goto error;
784-
if (0 < signum && signum < NSIG)
785-
err = sigaddset(mask, (int)signum);
786-
else
787-
err = 1;
788-
if (err) {
783+
if (0 < signum && signum < NSIG) {
784+
/* bpo-33329: ignore sigaddset() return value as it can fail
785+
* for some reserved signals, but we want the `range(1, NSIG)`
786+
* idiom to allow selecting all valid signals.
787+
*/
788+
(void) sigaddset(mask, (int)signum);
789+
}
790+
else {
789791
PyErr_Format(PyExc_ValueError,
790792
"signal number %ld out of range", signum);
791793
goto error;

0 commit comments

Comments
 (0)