Close #13022: _multiprocessing.recvfd() doesn't check that file descriptor was actually received

This commit is contained in:
Jesus Cea 2011-09-21 03:53:25 +02:00
parent d0b10a6435
commit 4507e6456e
3 changed files with 31 additions and 0 deletions

View file

@ -177,6 +177,17 @@ multiprocessing_recvfd(PyObject *self, PyObject *args)
if (res < 0)
return PyErr_SetFromErrno(PyExc_OSError);
if (msg.msg_controllen < CMSG_LEN(sizeof(int)) ||
(cmsg = CMSG_FIRSTHDR(&msg)) == NULL ||
cmsg->cmsg_level != SOL_SOCKET ||
cmsg->cmsg_type != SCM_RIGHTS ||
cmsg->cmsg_len < CMSG_LEN(sizeof(int))) {
/* If at least one control message is present, there should be
no room for any further data in the buffer. */
PyErr_SetString(PyExc_RuntimeError, "No file descriptor received");
return NULL;
}
fd = * (int *) CMSG_DATA(cmsg);
return Py_BuildValue("i", fd);
}