Skip to content

gh-160561: Close the duplicated descriptor when fromfd() is rejected #160579

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

Open
scrieve wants to merge 8 commits into
base: main
Choose a base branch
from
Open

gh-160561: Close the duplicated descriptor when fromfd() is rejected #160579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c7af374
gh-160561: Close the duplicated descriptor when fromfd() is rejected
scrieve Oct 24, 2026
b545c72
gh-160561: Address review comments on the fromfd() leak fix
scrieve Oct 25, 2026
5643f6f
gh-160561: Use AF_INET so the test runs on Windows
scrieve Oct 26, 2026
f7e4d09
gh-160561: Use AF_UNIX in the fromfd() error test, matching the revie…
scrieve Oct 26, 2026
2cbb4c0
gh-160561: Keep AF_INET in the fromfd() error test
scrieve Oct 26, 2026
3cf12d1
gh-160561: Remove the outdated comment from testFromFdError
scrieve Oct 26, 2026
86b7495
gh-160561: Match the reviewed test exactly: no comment, AF_UNIX
scrieve Oct 26, 2026
7919305
gh-160561: Use AF_INET in testFromFdError so it runs on Windows
scrieve Oct 26, 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
6 changes: 5 additions & 1 deletion Lib/socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,11 @@ def fromfd(fd, family, type, proto=0):
descriptor. The remaining arguments are the same as for socket().
"""
nfd = dup(fd)
return socket(family, type, proto, nfd)
try:
return socket(family, type, proto, nfd)
except:
close(nfd)
raise

if hasattr(_socket.socket, "sendmsg"):
def send_fds(sock, buffers, fds, flags=0, address=None):
Expand Down
16 changes: 16 additions & 0 deletions Lib/test/test_socket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3195,6 +3195,22 @@ def testFromFd(self):
def _testFromFd(self):
self.serv_conn.send(MSG)

def testFromFdError(self):
fd = self.cli_conn.fileno()
fd_count_before = os_helper.fd_count()

with self.assertRaises(TypeError):
socket.fromfd(fd, "not-a-valid-family", socket.SOCK_STREAM)
with self.assertRaises(TypeError):
socket.fromfd(fd, socket.AF_INET, "not-a-valid-type")
with self.assertRaises(OverflowError):
socket.fromfd(fd, socket.AF_INET, 1 << 100)

self.assertEqual(os_helper.fd_count(), fd_count_before)

def _testFromFdError(self):
pass

@vstinner vstinner Oct 25, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use os_helper.fd_count() which works on all platforms. I suggest a shorter test name and more flat code to trigger errors:

Suggested change
def testFromFdError(self):
# Make sure that the fromfd() duplicated socket is closed on error.
# In debug mode, Python test suite checks for file descriptor leaks.
fd = self.cli_conn.fileno()
fd_count_before = os_helper.fd_count()
with self.assertRaises(TypeError):
socket.fromfd(fd, "not-a-valid-family", socket.SOCK_STREAM)
with self.assertRaises(TypeError):
socket.fromfd(fd, socket.AF_UNIX, "not-a-valid-type")
with self.assertRaises(OverflowError):
socket.fromfd(fd, socket.AF_UNIX, 1 << 100)
self.assertEqual(os_helper.fd_count(), fd_count_before)
def _testFromFdError(self):
pass

def testDup(self):
# Testing dup()
sock = self.cli_conn.dup()
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2026-10-24-07-58-00.gh-issue-160561.b3Kq1z.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a descriptor leak in :func:`socket.fromfd` when the socket constructor rejects its arguments. The duplicated descriptor was never closed.
Loading