mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-35415: validate fileno argument to socket.socket (GH-10917)

Browse source 
https://bugs.python.org/issue35415
This commit is contained in:
Dima Tisnek 2018-12-17 22:07:55 +09:00 • committed by Miss Islington (bot)
parent 05c1b387f1
commit e991270363
3 changed files with 80 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

61
Modules/socketmodule.c
View file

@ -5018,28 +5018,45 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
else
#endif
{
fd = PyLong_AsSocket_t(fdobj);
if (fd == (SOCKET_T)(-1) && PyErr_Occurred())
return -1;
if (fd == INVALID_SOCKET) {
PyErr_SetString(PyExc_ValueError,
"can't use invalid socket value");
if (PyFloat_Check(fdobj)) {
PyErr_SetString(PyExc_TypeError,
"integer argument expected, got float");
return -1;
}
if (family == -1) {
sock_addr_t addrbuf;
socklen_t addrlen = sizeof(sock_addr_t);
memset(&addrbuf, 0, addrlen);
if (getsockname(fd, SAS2SA(&addrbuf), &addrlen) == 0) {
family = SAS2SA(&addrbuf)->sa_family;
} else {
fd = PyLong_AsSocket_t(fdobj);
if (fd == (SOCKET_T)(-1) && PyErr_Occurred())
return -1;
#ifdef MS_WINDOWS
PyErr_SetFromWindowsErrWithFilename(0, "family");
if (fd == INVALID_SOCKET) {
#else
PyErr_SetFromErrnoWithFilename(PyExc_OSError, "family");
if (fd < 0) {
#endif
PyErr_SetString(PyExc_ValueError, "negative file descriptor");
return -1;
}
/* validate that passed file descriptor is valid and a socket. */
sock_addr_t addrbuf;
socklen_t addrlen = sizeof(sock_addr_t);
memset(&addrbuf, 0, addrlen);
if (getsockname(fd, SAS2SA(&addrbuf), &addrlen) == 0) {
if (family == -1) {
family = SAS2SA(&addrbuf)->sa_family;
}
} else {
#ifdef MS_WINDOWS
/* getsockname() on an unbound socket is an error on Windows.
Invalid descriptor and not a socket is same error code.
Error out if family must be resolved, or bad descriptor. */
if (family == -1 || CHECK_ERRNO(ENOTSOCK)) {
#else
/* getsockname() is not supported for SOL_ALG on Linux. */
if (family == -1 || CHECK_ERRNO(EBADF) || CHECK_ERRNO(ENOTSOCK)) {
#endif
set_error();
return -1;
}
}
@ -5052,11 +5069,7 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
{
type = tmp;
} else {
#ifdef MS_WINDOWS
PyErr_SetFromWindowsErrWithFilename(0, "type");
#else
PyErr_SetFromErrnoWithFilename(PyExc_OSError, "type");
#endif
set_error();
return -1;
}
}
@ -5072,11 +5085,7 @@ sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
{
proto = tmp;
} else {
#ifdef MS_WINDOWS
PyErr_SetFromWindowsErrWithFilename(0, "protocol");
#else
PyErr_SetFromErrnoWithFilename(PyExc_OSError, "protocol");
#endif
set_error();
return -1;
}
}