Skip to content

Commit 25038ec

Browse files
authored
bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575)
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.
1 parent c2d384d commit 25038ec

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
@@ -819,7 +819,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
819819
int result = -1;
820820
PyObject *iterator, *item;
821821
long signum;
822-
int err;
823822

824823
sigemptyset(mask);
825824

@@ -841,11 +840,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
841840
Py_DECREF(item);
842841
if (signum == -1 && PyErr_Occurred())
843842
goto error;
844-
if (0 < signum && signum < NSIG)
845-
err = sigaddset(mask, (int)signum);
846-
else
847-
err = 1;
848-
if (err) {
843+
if (0 < signum && signum < NSIG) {
844+
/* bpo-33329: ignore sigaddset() return value as it can fail
845+
* for some reserved signals, but we want the `range(1, NSIG)`
846+
* idiom to allow selecting all valid signals.
847+
*/
848+
(void) sigaddset(mask, (int)signum);
849+
}
850+
else {
849851
PyErr_Format(PyExc_ValueError,
850852
"signal number %ld out of range", signum);
851853
goto error;

0 commit comments

Comments
 (0)