JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* libc/posix/closedir.c: Fix use after free.

Browse Source 
Remove useless test dd_fd != -1
	* libc/posix/readdir.c: Remove useless test dd_fd == -1
	* libc/posix/readdir_r.c: Ditto.
This commit is contained in:
Corinna Vinschen 2013-11-19 11:48:02 +00:00
parent 700a3783ee
commit ff125797e3
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
newlib/ChangeLog
View File

@ -1,3 +1,10 @@
2013-11-19 Terraneo Federico <fede.tft@hotmail.it>
* libc/posix/closedir.c: Fix use after free.
Remove useless test dd_fd != -1
* libc/posix/readdir.c: Remove useless test dd_fd == -1
* libc/posix/readdir_r.c: Ditto.
2013-11-18 Sahil Patnayakuni <sahilp@oarcorp.com> 2013-11-18 Sahil Patnayakuni <sahilp@oarcorp.com>
* libc/include/stdio.h, libc/machine/powerpc/vfscanf.c, * libc/include/stdio.h, libc/machine/powerpc/vfscanf.c,

16
newlib/libc/posix/closedir.c
View File

@ -52,25 +52,19 @@ int
_DEFUN(closedir, (dirp), _DEFUN(closedir, (dirp),
register DIR *dirp) register DIR *dirp)
{ {
int fd, rc; int rc;
#ifdef HAVE_DD_LOCK #ifdef HAVE_DD_LOCK
__lock_acquire_recursive(dirp->dd_lock); __lock_acquire_recursive(dirp->dd_lock);
#endif #endif
rc = 0; rc = close(dirp->dd_fd);
fd = dirp->dd_fd; _cleanupdir(dirp);
if (fd != -1) { free((void *)dirp->dd_buf);
dirp->dd_fd = -1;
dirp->dd_loc = 0;
(void)free((void *)dirp->dd_buf);
(void)free((void *)dirp);
rc = close(fd);
_cleanupdir(dirp);
}
#ifdef HAVE_DD_LOCK #ifdef HAVE_DD_LOCK
__lock_release_recursive(dirp->dd_lock); __lock_release_recursive(dirp->dd_lock);
__lock_close_recursive(dirp->dd_lock); __lock_close_recursive(dirp->dd_lock);
#endif #endif
free((void *)dirp);
return rc; return rc;
} }

3
newlib/libc/posix/readdir.c
View File

@ -53,9 +53,6 @@ _DEFUN(readdir, (dirp),
#ifdef HAVE_DD_LOCK #ifdef HAVE_DD_LOCK
__lock_acquire_recursive(dirp->dd_lock); __lock_acquire_recursive(dirp->dd_lock);
#endif #endif
if (dirp->dd_fd == -1)
return NULL;
for (;;) { for (;;) {
if (dirp->dd_loc == 0) { if (dirp->dd_loc == 0) {

5
newlib/libc/posix/readdir_r.c
View File

@ -60,11 +60,6 @@ struct dirent *tmpdp;
#ifdef HAVE_DD_LOCK #ifdef HAVE_DD_LOCK
__lock_acquire_recursive(dirp->dd_lock); __lock_acquire_recursive(dirp->dd_lock);
#endif #endif
if (dirp->dd_fd == -1) {
*dpp = NULL;
return errno = EBADF;
}
for (;;) { for (;;) {
if (dirp->dd_loc == 0) { if (dirp->dd_loc == 0) {