Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is

greater than FD_SETSIZE.
This commit is contained in:
Charles-François Natali 2011-08-28 18:10:27 +02:00
commit ac7e9e058d
6 changed files with 21 additions and 19 deletions

View File

@ -44,6 +44,13 @@ int _PyVerify_fd(int fd);
#endif #endif
#endif /* Py_LIMITED_API */ #endif /* Py_LIMITED_API */
/* A routine to check if a file descriptor can be select()-ed. */
#ifdef HAVE_SELECT
#define _PyIsSelectable_fd(FD) (((FD) >= 0) && ((FD) < FD_SETSIZE))
#else
#define _PyIsSelectable_fd(FD) (1)
#endif /* HAVE_SELECT */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View File

@ -268,6 +268,9 @@ Core and Builtins
Library Library
------- -------
- Issue #12287: Fix a stack corruption in ossaudiodev module when the FD is
greater than FD_SETSIZE.
- Issue #12839: Fix crash in zlib module due to version mismatch. - Issue #12839: Fix crash in zlib module due to version mismatch.
Fix by Richard M. Tew. Fix by Richard M. Tew.

View File

@ -1040,10 +1040,8 @@ check_socket_and_wait_for_timeout(PySocketSockObject *s, int writing)
#endif #endif
/* Guard against socket too large for select*/ /* Guard against socket too large for select*/
#ifndef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE if (!_PyIsSelectable_fd(s->sock_fd))
if (s->sock_fd >= FD_SETSIZE)
return SOCKET_TOO_LARGE_FOR_SELECT; return SOCKET_TOO_LARGE_FOR_SELECT;
#endif
/* Construct the arguments to select */ /* Construct the arguments to select */
tv.tv_sec = (int)s->sock_timeout; tv.tv_sec = (int)s->sock_timeout;

View File

@ -474,6 +474,11 @@ oss_writeall(oss_audio_t *self, PyObject *args)
if (!PyArg_ParseTuple(args, "y#:write", &cp, &size)) if (!PyArg_ParseTuple(args, "y#:write", &cp, &size))
return NULL; return NULL;
if (!_PyIsSelectable_fd(self->fd)) {
PyErr_SetString(PyExc_ValueError,
"file descriptor out of range for select");
return NULL;
}
/* use select to wait for audio device to be available */ /* use select to wait for audio device to be available */
FD_ZERO(&write_set_fds); FD_ZERO(&write_set_fds);
FD_SET(self->fd, &write_set_fds); FD_SET(self->fd, &write_set_fds);

View File

@ -110,7 +110,7 @@ seq2set(PyObject *seq, fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
#if defined(_MSC_VER) #if defined(_MSC_VER)
max = 0; /* not used for Win32 */ max = 0; /* not used for Win32 */
#else /* !_MSC_VER */ #else /* !_MSC_VER */
if (v < 0 || v >= FD_SETSIZE) { if (!_PyIsSelectable_fd(v)) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"filedescriptor out of range in select()"); "filedescriptor out of range in select()");
goto finally; goto finally;
@ -160,13 +160,6 @@ set2list(fd_set *set, pylist fd2obj[FD_SETSIZE + 1])
for (j = 0; fd2obj[j].sentinel >= 0; j++) { for (j = 0; fd2obj[j].sentinel >= 0; j++) {
fd = fd2obj[j].fd; fd = fd2obj[j].fd;
if (FD_ISSET(fd, set)) { if (FD_ISSET(fd, set)) {
#ifndef _MSC_VER
if (fd > FD_SETSIZE) {
PyErr_SetString(PyExc_SystemError,
"filedescriptor out of range returned in select()");
goto finally;
}
#endif
o = fd2obj[j].obj; o = fd2obj[j].obj;
fd2obj[j].obj = NULL; fd2obj[j].obj = NULL;
/* transfer ownership */ /* transfer ownership */

View File

@ -485,18 +485,14 @@ static PyTypeObject sock_type;
#define SOCKLEN_T_LIMIT INT_MAX #define SOCKLEN_T_LIMIT INT_MAX
#endif #endif
#ifdef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE #ifdef HAVE_POLL
/* Platform can select file descriptors beyond FD_SETSIZE */
#define IS_SELECTABLE(s) 1
#elif defined(HAVE_POLL)
/* Instead of select(), we'll use poll() since poll() works on any fd. */ /* Instead of select(), we'll use poll() since poll() works on any fd. */
#define IS_SELECTABLE(s) 1 #define IS_SELECTABLE(s) 1
/* Can we call select() with this socket without a buffer overrun? */ /* Can we call select() with this socket without a buffer overrun? */
#else #else
/* POSIX says selecting file descriptors beyond FD_SETSIZE /* If there's no timeout left, we don't have to call select, so it's a safe,
has undefined behaviour. If there's no timeout left, we don't have to * little white lie. */
call select, so it's a safe, little white lie. */ #define IS_SELECTABLE(s) (_PyIsSelectable_fd((s)->sock_fd) || (s)->sock_timeout <= 0.0)
#define IS_SELECTABLE(s) ((s)->sock_fd < FD_SETSIZE || s->sock_timeout <= 0.0)
#endif #endif
static PyObject* static PyObject*