Skip to content

Commit 8ec1fd1

Browse files
csabellapitrou
authored andcommitted
[3.5] bpo-33329: Fix multiprocessing regression on newer glibcs (GH-6575) (#12144)
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 56f8783 commit 8ec1fd1

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
@@ -744,7 +744,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
744744
int result = -1;
745745
PyObject *iterator, *item;
746746
long signum;
747-
int err;
748747

749748
sigemptyset(mask);
750749

@@ -766,11 +765,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
766765
Py_DECREF(item);
767766
if (signum == -1 && PyErr_Occurred())
768767
goto error;
769-
if (0 < signum && signum < NSIG)
770-
err = sigaddset(mask, (int)signum);
771-
else
772-
err = 1;
773-
if (err) {
768+
if (0 < signum && signum < NSIG) {
769+
/* bpo-33329: ignore sigaddset() return value as it can fail
770+
* for some reserved signals, but we want the `range(1, NSIG)`
771+
* idiom to allow selecting all valid signals.
772+
*/
773+
(void) sigaddset(mask, (int)signum);
774+
}
775+
else {
774776
PyErr_Format(PyExc_ValueError,
775777
"signal number %ld out of range", signum);
776778
goto error;

0 commit comments

Comments
 (0)