X Tutup
Skip to content

GH-102397: Fix segfault from race condition in signal handling #102399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kumaraditya303 merged 7 commits into from
Mar 8, 2023
Merged

GH-102397: Fix segfault from race condition in signal handling #102399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ace9cf5
fix race in signal handling
kumaraditya303 Mar 3, 2023
f52a046
comment
kumaraditya303 Mar 3, 2023
1e14780
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 4, 2023
e75e287
Merge branch 'main' into signal
kumaraditya303 Mar 4, 2023
7c01cdd
mention that it happens during garbage collection
gpshead Mar 8, 2023
50e870d
add comment
kumaraditya303 Mar 8, 2023
9e7d4d9
Merge branch 'main' into signal
kumaraditya303 Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix race in signal handling
  • Loading branch information
@kumaraditya303
kumaraditya303 committed Mar 3, 2023
commit ace9cf5c167d1bf69ff37e1367f335888c6a0a2a
15 changes: 15 additions & 0 deletions Lib/test/test_signal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import _thread
import enum
import errno
import inspect
Expand Down Expand Up @@ -1406,6 +1407,20 @@ def handler(a, b):
signal.raise_signal(signal.SIGINT)
self.assertTrue(is_ok)

def test__thread_interrupt_main(self):
code = """if 1:
import _thread
class Foo():
def __del__(self):
_thread.interrupt_main()

x = Foo()
"""

rc, out, err = assert_python_ok('-c', code)
self.assertIn(b'OSError: Signal 2 ignored due to race condition', err)



class PidfdSignalTest(unittest.TestCase):

Expand Down
3 changes: 3 additions & 0 deletions Modules/signalmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ get_signal_state(PyObject *module)
static inline int
compare_handler(PyObject *func, PyObject *dfl_ign_handler)
{
if (func == NULL || dfl_ign_handler == NULL) {
return 0;
}
assert(PyLong_CheckExact(dfl_ign_handler));
if (!PyLong_CheckExact(func)) {
return 0;
Expand Down
X Tutup