Commit9300a59

authored

gh-134744: Fix fcntl error handling (#134748)

Fix also reference leak on buffer overflow.

1 parent176b059 commit9300a59Copy full SHA for 9300a59

File tree

+28

-4

lines changed

+28

-4

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`cpython_only,get_pagesize,is_apple,requires_subprocess,verbose`
`12`	`12`	`)`
`13`	`13`	`fromtest.support.import_helperimportimport_module`
`14`		`-fromtest.support.os_helperimportTESTFN,unlink`
	`14`	`+fromtest.support.os_helperimportTESTFN,unlink,make_bad_fd`
`15`	`15`
`16`	`16`
`17`	`17`	`# Skip test if no fcntl module.`
`@@ -274,6 +274,17 @@ def test_fcntl_small_buffer(self):`
`274`	`274`	`deftest_fcntl_large_buffer(self):`
`275`	`275`	`self._check_fcntl_not_mutate_len(2024)`
`276`	`276`
	`277`	`+@unittest.skipUnless(hasattr(fcntl,'F_DUPFD'),'need fcntl.F_DUPFD')`
	`278`	`+deftest_bad_fd(self):`
	`279`	`+# gh-134744: Test error handling`
	`280`	`+fd=make_bad_fd()`
	`281`	`+withself.assertRaises(OSError):`
	`282`	`+fcntl.fcntl(fd,fcntl.F_DUPFD,0)`
	`283`	`+withself.assertRaises(OSError):`
	`284`	`+fcntl.fcntl(fd,fcntl.F_DUPFD,b'\0'*10)`
	`285`	`+withself.assertRaises(OSError):`
	`286`	`+fcntl.fcntl(fd,fcntl.F_DUPFD,b'\0'*2048)`
	`287`	`+`
`277`	`288`
`278`	`289`	`if__name__=='__main__':`
`279`	`290`	`unittest.main()`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`importthreading`
`6`	`6`	`importunittest`
`7`	`7`	`fromtestimportsupport`
`8`		`-fromtest.supportimportthreading_helper`
	`8`	`+fromtest.supportimportos_helper,threading_helper`
`9`	`9`	`fromtest.support.import_helperimportimport_module`
`10`	`10`	`fcntl=import_module('fcntl')`
`11`	`11`	`termios=import_module('termios')`
`@@ -201,6 +201,17 @@ def test_ioctl_set_window_size(self):`
`201`	`201`	`new_winsz=struct.unpack("HHHH",result)`
`202`	`202`	`self.assertEqual(new_winsz[:2], (20,40))`
`203`	`203`
	`204`	`+@unittest.skipUnless(hasattr(fcntl,'FICLONE'),'need fcntl.FICLONE')`
	`205`	`+deftest_bad_fd(self):`
	`206`	`+# gh-134744: Test error handling`
	`207`	`+fd=os_helper.make_bad_fd()`
	`208`	`+withself.assertRaises(OSError):`
	`209`	`+fcntl.ioctl(fd,fcntl.FICLONE,fd)`
	`210`	`+withself.assertRaises(OSError):`
	`211`	`+fcntl.ioctl(fd,fcntl.FICLONE,b'\0'*10)`
	`212`	`+withself.assertRaises(OSError):`
	`213`	`+fcntl.ioctl(fd,fcntl.FICLONE,b'\0'*2048)`
	`214`	`+`
`204`	`215`
`205`	`216`	`if__name__=="__main__":`
`206`	`217`	`unittest.main()`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -128,14 +128,15 @@ fcntl_fcntl_impl(PyObject module, int fd, int code, PyObject arg)`
`128`	`128`	`Py_END_ALLOW_THREADS`
`129`	`129`	`}while (ret==-1&&errno==EINTR&& !(async_err=PyErr_CheckSignals()));`
`130`	`130`	`if (ret<0) {`
`131`		`-if (async_err) {`
	`131`	`+if (!async_err) {`
`132`	`132`	`PyErr_SetFromErrno(PyExc_OSError);`
`133`	`133`	`}`
`134`	`134`	`Py_DECREF(result);`
`135`	`135`	`returnNULL;`
`136`	`136`	`}`
`137`	`137`	`if (ptr[len]!='\0') {`
`138`	`138`	`PyErr_SetString(PyExc_SystemError,"buffer overflow");`
	`139`	`+Py_DECREF(result);`
`139`	`140`	`returnNULL;`
`140`	`141`	`}`
`141`	`142`	`returnresult;`
`@@ -310,14 +311,15 @@ fcntl_ioctl_impl(PyObject module, int fd, unsigned long code, PyObject arg,`
`310`	`311`	`Py_END_ALLOW_THREADS`
`311`	`312`	`}while (ret==-1&&errno==EINTR&& !(async_err=PyErr_CheckSignals()));`
`312`	`313`	`if (ret<0) {`
`313`		`-if (async_err) {`
	`314`	`+if (!async_err) {`
`314`	`315`	`PyErr_SetFromErrno(PyExc_OSError);`
`315`	`316`	`}`
`316`	`317`	`Py_DECREF(result);`
`317`	`318`	`returnNULL;`
`318`	`319`	`}`
`319`	`320`	`if (ptr[len]!='\0') {`
`320`	`321`	`PyErr_SetString(PyExc_SystemError,"buffer overflow");`
	`322`	`+Py_DECREF(result);`
`321`	`323`	`returnNULL;`
`322`	`324`	`}`
`323`	`325`	`returnresult;`

Comments

(0)