[Python-checkins] bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866)
gpshead
webhook-mailer at python.org
Sun Mar 27 16:22:32 EDT 2022
https://github.com/python/cpython/commit/f6b3a07b7df60dc04d0260169ffef6e9796a2124
commit: f6b3a07b7df60dc04d0260169ffef6e9796a2124
branch: main
author: ty <zonyitoo at users.noreply.github.com>
committer: gpshead <greg at krypto.org>
date: 2022-03-27T13:22:22-07:00
summary:
bpo-44493: Add missing terminated NUL in sockaddr_un's length (GH-26866)
Add missing terminated NUL in sockaddr_un's length
- Linux: https://man7.org/linux/man-pages/man7/unix.7.html
- *BSD: SUN_LEN
files:
A Misc/NEWS.d/next/Library/2021-07-26-10-46-49.bpo-44493.xp3CRH.rst
M Modules/socketmodule.c
diff --git a/Misc/NEWS.d/next/Library/2021-07-26-10-46-49.bpo-44493.xp3CRH.rst b/Misc/NEWS.d/next/Library/2021-07-26-10-46-49.bpo-44493.xp3CRH.rst
new file mode 100644
index 0000000000000..390a7222bbf55
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-07-26-10-46-49.bpo-44493.xp3CRH.rst
@@ -0,0 +1,3 @@
+Add missing terminated NUL in sockaddr_un's length
+
+This was potentially observable when using non-abstract AF_UNIX datagram sockets to processes written in another programming language.
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 7f7af1895bd9f..c7bc10b5dbbbc 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -1689,6 +1689,8 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
"AF_UNIX path too long");
goto unix_out;
}
+
+ *len_ret = path.len + offsetof(struct sockaddr_un, sun_path);
}
else
#endif /* linux */
@@ -1700,10 +1702,13 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
goto unix_out;
}
addr->sun_path[path.len] = 0;
+
+ /* including the tailing NUL */
+ *len_ret = path.len + offsetof(struct sockaddr_un, sun_path) + 1;
}
addr->sun_family = s->sock_family;
memcpy(addr->sun_path, path.buf, path.len);
- *len_ret = path.len + offsetof(struct sockaddr_un, sun_path);
+
retval = 1;
unix_out:
PyBuffer_Release(&path);
More information about the Python-checkins
mailing list