Skip to content

Commit 5d75edd

Browse files
miss-islingtonnirs
andauthored
gh-94821: Fix autobind of empty unix domain address (GH-94826)
When binding a unix socket to an empty address on Linux, the socket is automatically bound to an available address in the abstract namespace. >>> s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) >>> s.bind("") >>> s.getsockname() b'\x0075499' Since python 3.9, the socket is bound to the one address: >>> s.getsockname() b'\x00' And trying to bind multiple sockets will fail with: Traceback (most recent call last): File "/home/nsoffer/src/cpython/Lib/test/test_socket.py", line 5553, in testAutobind s2.bind("") OSError: [Errno 98] Address already in use Added 2 tests: - Auto binding empty address on Linux - Failing to bind an empty address on other platforms Fixes f6b3a07 (bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866) (cherry picked from commit c22f134) Co-authored-by: Nir Soffer <[email protected]>
1 parent 31608ab commit 5d75edd

File tree

3 files changed

+25
-2
lines changed

3 files changed

+25
-2
lines changed

Lib/test/test_socket.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5421,6 +5421,20 @@ def testBytearrayName(self):
54215421
s.bind(bytearray(b"\x00python\x00test\x00"))
54225422
self.assertEqual(s.getsockname(), b"\x00python\x00test\x00")
54235423

5424+
def testAutobind(self):
5425+
# Check that binding to an empty string binds to an available address
5426+
# in the abstract namespace as specified in unix(7) "Autobind feature".
5427+
abstract_address = b"^\0[0-9a-f]{5}"
5428+
with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s1:
5429+
s1.bind("")
5430+
self.assertRegex(s1.getsockname(), abstract_address)
5431+
# Each socket is bound to a different abstract address.
5432+
with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as s2:
5433+
s2.bind("")
5434+
self.assertRegex(s2.getsockname(), abstract_address)
5435+
self.assertNotEqual(s1.getsockname(), s2.getsockname())
5436+
5437+
54245438
@unittest.skipUnless(hasattr(socket, 'AF_UNIX'), 'test needs socket.AF_UNIX')
54255439
class TestUnixDomain(unittest.TestCase):
54265440

@@ -5490,6 +5504,11 @@ def testUnencodableAddr(self):
54905504
self.addCleanup(os_helper.unlink, path)
54915505
self.assertEqual(self.sock.getsockname(), path)
54925506

5507+
@unittest.skipIf(sys.platform == 'linux', 'Linux specific test')
5508+
def testEmptyAddress(self):
5509+
# Test that binding empty address fails.
5510+
self.assertRaises(OSError, self.sock.bind, "")
5511+
54935512

54945513
class BufferIOTest(SocketConnectedTest):
54955514
"""
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix binding of unix socket to empty address on Linux to use an available
2+
address from the abstract namespace, instead of "\0".

Modules/socketmodule.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,8 +1675,10 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
16751675

16761676
struct sockaddr_un* addr = &addrbuf->un;
16771677
#ifdef __linux__
1678-
if (path.len > 0 && *(const char *)path.buf == 0) {
1679-
/* Linux abstract namespace extension */
1678+
if (path.len == 0 || *(const char *)path.buf == 0) {
1679+
/* Linux abstract namespace extension:
1680+
- Empty address auto-binding to an abstract address
1681+
- Address that starts with null byte */
16801682
if ((size_t)path.len > sizeof addr->sun_path) {
16811683
PyErr_SetString(PyExc_OSError,
16821684
"AF_UNIX path too long");

0 commit comments

Comments
 (0)