Skip to content

Commit a0dc70f

Browse files
pitroucsabella
authored andcommitted
[3.4] bpo-33329: Fix multiprocessing regression on newer glibcs (pythonGH-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. (cherry picked from commit 25038ec) Co-authored-by: Antoine Pitrou <pitrou@free.fr>
1 parent 765d333 commit a0dc70f

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
@@ -537,7 +537,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
537537
int result = -1;
538538
PyObject *iterator, *item;
539539
long signum;
540-
int err;
541540

542541
sigemptyset(mask);
543542

@@ -559,11 +558,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
559558
Py_DECREF(item);
560559
if (signum == -1 && PyErr_Occurred())
561560
goto error;
562-
if (0 < signum && signum < NSIG)
563-
err = sigaddset(mask, (int)signum);
564-
else
565-
err = 1;
566-
if (err) {
561+
if (0 < signum && signum < NSIG) {
562+
/* bpo-33329: ignore sigaddset() return value as it can fail
563+
* for some reserved signals, but we want the `range(1, NSIG)`
564+
* idiom to allow selecting all valid signals.
565+
*/
566+
(void) sigaddset(mask, (int)signum);
567+
}
568+
else {
567569
PyErr_Format(PyExc_ValueError,
568570
"signal number %ld out of range", signum);
569571
goto error;

0 commit comments

Comments
 (0)