Commit1a84cc0

and

authored

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

Co-authored-by: Gregory P. Smith <greg@krypto.org>

1 parent061325e commit1a84cc0Copy full SHA for 1a84cc0

File tree

+21

-0

lines changed

+21

-0

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1406,6 +1406,21 @@ def handler(a, b):`
`1406`	`1406`	`signal.raise_signal(signal.SIGINT)`
`1407`	`1407`	`self.assertTrue(is_ok)`
`1408`	`1408`
	`1409`	`+deftest__thread_interrupt_main(self):`
	`1410`	`+# See https://github.com/python/cpython/issues/102397`
	`1411`	`+code="""if 1:`
	`1412`	`+ import _thread`
	`1413`	`+ class Foo():`
	`1414`	`+ def __del__(self):`
	`1415`	`+ _thread.interrupt_main()`
	`1416`	`+`
	`1417`	`+ x = Foo()`
	`1418`	`+ """`
	`1419`	`+`
	`1420`	`+rc,out,err=assert_python_ok('-c',code)`
	`1421`	`+self.assertIn(b'OSError: Signal 2 ignored due to race condition',err)`
	`1422`	`+`
	`1423`	`+`
`1409`	`1424`
`1410`	`1425`	`classPidfdSignalTest(unittest.TestCase):`
`1411`	`1426`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix segfault from race condition in signal handling during garbage collection.`
	`2`	`+Patch by Kumar Aditya.`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,10 @@ get_signal_state(PyObject *module)`
`148`	`148`	`staticinlineint`
`149`	`149`	`compare_handler(PyObjectfunc,PyObjectdfl_ign_handler)`
`150`	`150`	`{`
	`151`	`+// See https://github.com/python/cpython/pull/102399`
	`152`	`+if (func==NULL\|\|dfl_ign_handler==NULL) {`
	`153`	`+return0;`
	`154`	`+ }`
`151`	`155`	`assert(PyLong_CheckExact(dfl_ign_handler));`
`152`	`156`	`if (!PyLong_CheckExact(func)) {`
`153`	`157`	`return0;`

Comments

(0)