blob: 534a097771c73f8dcbee63ce07ba62ddf485db62 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 4315389df3c4e8c1f94a18ab11a4b234762132b1 Mon Sep 17 00:00:00 2001
5From: Antoine Pitrou <pitrou@free.fr>
6Date: Mon, 23 Apr 2018 22:22:49 +0200
7Subject: [PATCH] [3.6] bpo-33329: Fix multiprocessing regression on newer
8 glibcs (GH-6575) (GH-6582)
9
10Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some
11reserved signal numbers between 1 and NSIG. The `range(1, NSIG)` idiom
12is commonly used to select all signals for blocking with `pthread_sigmask`.
13So we ignore the sigaddset() return value until we expose sigfillset()
14to provide a better idiom.
15(cherry picked from commit 25038ecfb665bef641abf8cb61afff7505b0e008)
16---
17 .../next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst | 1 +
18 Modules/signalmodule.c | 14 ++++++++------
19 2 files changed, 9 insertions(+), 6 deletions(-)
20 create mode 100644 Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst
21
22diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
23index e0d06b434d..138e74e8a9 100644
24--- a/Modules/signalmodule.c
25+++ b/Modules/signalmodule.c
26@@ -744,7 +744,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
27 int result = -1;
28 PyObject *iterator, *item;
29 long signum;
30- int err;
31
32 sigemptyset(mask);
33
34@@ -766,11 +765,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask)
35 Py_DECREF(item);
36 if (signum == -1 && PyErr_Occurred())
37 goto error;
38- if (0 < signum && signum < NSIG)
39- err = sigaddset(mask, (int)signum);
40- else
41- err = 1;
42- if (err) {
43+ if (0 < signum && signum < NSIG) {
44+ /* bpo-33329: ignore sigaddset() return value as it can fail
45+ * for some reserved signals, but we want the `range(1, NSIG)`
46+ * idiom to allow selecting all valid signals.
47+ */
48+ (void) sigaddset(mask, (int)signum);
49+ }
50+ else {
51 PyErr_Format(PyExc_ValueError,
52 "signal number %ld out of range", signum);
53 goto error;
54--
552.11.0
56