Skip to content

gh-146205: Check the errno with != 0 in close impls in select module #146206

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
vstinner merged 2 commits into from
Mar 20, 2026
Merged

gh-146205: Check the errno with != 0 in close impls in select module #146206

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9817d7
Check the errno with != 0 in close impls
aisk Mar 20, 2026
53d6b3a
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 20, 2026
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
Check the errno with != 0 in close impls
  • Loading branch information
@aisk
aisk committed Mar 20, 2026
commit b9817d714c372df86dea9b924c4a712872b0bf4e
10 changes: 10 additions & 0 deletions Lib/test/test_devpoll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Initial tests are copied as is from "test_poll.py"

import errno
import os
import random
import select
Expand Down Expand Up @@ -112,6 +113,15 @@ def test_close(self):
self.assertRaises(ValueError, devpoll.register, fd, select.POLLIN)
self.assertRaises(ValueError, devpoll.unregister, fd)

def test_close_error(self):
# gh-146205: close() should raise OSError if underlying fd is invalid
devpoll = select.devpoll()
fd = devpoll.fileno()
os.close(fd)
with self.assertRaises(OSError) as cm:
devpoll.close()
self.assertEqual(cm.exception.errno, errno.EBADF)

def test_fd_non_inheritable(self):
devpoll = select.devpoll()
self.addCleanup(devpoll.close)
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_epoll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,15 @@ def test_close(self):
self.assertRaises(ValueError, epoll.register, fd, select.EPOLLIN)
self.assertRaises(ValueError, epoll.unregister, fd)

def test_close_error(self):
# gh-146205: close() should raise OSError if underlying fd is invalid
epoll = select.epoll()
fd = epoll.fileno()
os.close(fd)
with self.assertRaises(OSError) as cm:
epoll.close()
self.assertEqual(cm.exception.errno, errno.EBADF)

def test_fd_non_inheritable(self):
epoll = select.epoll()
self.addCleanup(epoll.close)
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_kqueue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,15 @@ def test_close(self):
# operations must fail with ValueError("I/O operation on closed ...")
self.assertRaises(ValueError, kqueue.control, None, 4)

def test_close_error(self):
# gh-146205: close() should raise OSError if underlying fd is invalid
kqueue = select.kqueue()
fd = kqueue.fileno()
os.close(fd)
with self.assertRaises(OSError) as cm:
kqueue.close()
self.assertEqual(cm.exception.errno, errno.EBADF)

def test_fd_non_inheritable(self):
kqueue = select.kqueue()
self.addCleanup(kqueue.close)
Expand Down
15 changes: 9 additions & 6 deletions Modules/selectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,8 +1118,9 @@ static PyObject *
select_devpoll_close_impl(devpollObject *self)
/*[clinic end generated code: output=26b355bd6429f21b input=408fde21a377ccfb]*/
{
errno = devpoll_internal_close(self);
if (errno < 0) {
int err = devpoll_internal_close(self);
if (err != 0) {
errno = err;
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}
Expand Down Expand Up @@ -1446,8 +1447,9 @@ static PyObject *
select_epoll_close_impl(pyEpoll_Object *self)
/*[clinic end generated code: output=ee2144c446a1a435 input=f626a769192e1dbe]*/
{
errno = pyepoll_internal_close(self);
if (errno < 0) {
int err = pyepoll_internal_close(self);
if (err != 0) {
errno = err;
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}
Expand Down Expand Up @@ -2263,8 +2265,9 @@ static PyObject *
select_kqueue_close_impl(kqueue_queue_Object *self)
/*[clinic end generated code: output=d1c7df0b407a4bc1 input=6d763c858b17b690]*/
{
errno = kqueue_queue_internal_close(self);
if (errno < 0) {
int err = kqueue_queue_internal_close(self);
if (err != 0) {
errno = err;
PyErr_SetFromErrno(PyExc_OSError);
return NULL;
}
Expand Down
Loading