mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 12:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

http://bugs.python.org/issue5544

Browse source 
Guard _fileio.c against other malicious os.close(f.fileno()) attempts.
Add tests to test_fileio.py to verify behaviour.
This commit is contained in:
Kristján Valur Jónsson 2009-03-24 15:27:42 +00:00
parent 649170bd66
commit a8abe86331
2 changed files with 134 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

51
Modules/_fileio.c
View file

@ -475,10 +475,13 @@ fileio_readinto(PyFileIOObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "w*", &pbuf))
return NULL;
Py_BEGIN_ALLOW_THREADS
errno = 0;
n = read(self->fd, pbuf.buf, pbuf.len);
Py_END_ALLOW_THREADS
if (_PyVerify_fd(self->fd)) {
Py_BEGIN_ALLOW_THREADS
errno = 0;
n = read(self->fd, pbuf.buf, pbuf.len);
Py_END_ALLOW_THREADS
} else
n = -1;
PyBuffer_Release(&pbuf);
if (n < 0) {
if (errno == EAGAIN)
@ -522,6 +525,9 @@ fileio_readall(PyFileIOObject *self)
Py_ssize_t total = 0;
int n;
if (!_PyVerify_fd(self->fd))
return PyErr_SetFromErrno(PyExc_IOError);
result = PyBytes_FromStringAndSize(NULL, SMALLCHUNK);
if (result == NULL)
return NULL;
@ -596,10 +602,13 @@ fileio_read(PyFileIOObject *self, PyObject *args)
return NULL;
ptr = PyBytes_AS_STRING(bytes);
Py_BEGIN_ALLOW_THREADS
errno = 0;
n = read(self->fd, ptr, size);
Py_END_ALLOW_THREADS
if (_PyVerify_fd(self->fd)) {
Py_BEGIN_ALLOW_THREADS
errno = 0;
n = read(self->fd, ptr, size);
Py_END_ALLOW_THREADS
} else
n = -1;
if (n < 0) {
if (errno == EAGAIN)
@ -632,10 +641,13 @@ fileio_write(PyFileIOObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "s*", &pbuf))
return NULL;
Py_BEGIN_ALLOW_THREADS
errno = 0;
n = write(self->fd, pbuf.buf, pbuf.len);
Py_END_ALLOW_THREADS
if (_PyVerify_fd(self->fd)) {
Py_BEGIN_ALLOW_THREADS
errno = 0;
n = write(self->fd, pbuf.buf, pbuf.len);
Py_END_ALLOW_THREADS
} else
n = -1;
PyBuffer_Release(&pbuf);
@ -688,13 +700,16 @@ portable_lseek(int fd, PyObject *posobj, int whence)
return NULL;
}
Py_BEGIN_ALLOW_THREADS
if (_PyVerify_fd(fd)) {
Py_BEGIN_ALLOW_THREADS
#if defined(MS_WIN64) || defined(MS_WINDOWS)
res = _lseeki64(fd, pos, whence);
res = _lseeki64(fd, pos, whence);
#else
res = lseek(fd, pos, whence);
res = lseek(fd, pos, whence);
#endif
Py_END_ALLOW_THREADS
Py_END_ALLOW_THREADS
} else
res = -1;
if (res < 0)
return PyErr_SetFromErrno(PyExc_IOError);
@ -757,13 +772,15 @@ fileio_truncate(PyFileIOObject *self, PyObject *args)
/* Move to the position to be truncated. */
posobj = portable_lseek(fd, posobj, 0);
}
if (posobj == NULL)
return NULL;
#if defined(HAVE_LARGEFILE_SUPPORT)
pos = PyLong_AsLongLong(posobj);
#else
pos = PyLong_AsLong(posobj);
#endif
if (PyErr_Occurred())
if (pos == -1 && PyErr_Occurred())
return NULL;
#ifdef MS_WINDOWS