generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am a37f3729: readdir: fix interface to kernel getdents64 function

Browse Source 
* commit 'a37f3729730e4e7345977915d67adc3eea93dfe4':
  readdir: fix interface to kernel getdents64 function
This commit is contained in:
Bruce Beare 2011-12-19 11:36:48 -08:00 committed by Android Git Automerger
commit 5936e36f6b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libc/unistd/opendir.c
View File

@ -92,6 +92,9 @@ static struct dirent*
_readdir_unlocked(DIR* dir) _readdir_unlocked(DIR* dir)
{ {
struct dirent* entry; struct dirent* entry;
#ifndef NDEBUG
unsigned reclen;
#endif
if ( !dir->_DIR_avail ) if ( !dir->_DIR_avail )
{ {
@ -115,15 +118,18 @@ _readdir_unlocked(DIR* dir)
if (((long)(void*)entry & 3) != 0) if (((long)(void*)entry & 3) != 0)
return NULL; return NULL;
if ( (unsigned)entry->d_reclen > sizeof(*entry) || #ifndef NDEBUG
entry->d_reclen <= offsetof(struct dirent, d_name) ) // paranoid testing of the interface with the kernel getdents64 system call
reclen = offsetof(struct dirent, d_name) + strlen(entry->d_name) + 1;
if ( reclen > sizeof(*entry) || reclen <= offsetof(struct dirent, d_name) )
goto Bad; goto Bad;
if ( (char*)entry + entry->d_reclen > (char*)dir->_DIR_buff + sizeof(dir->_DIR_buff) ) if ( (char*)entry + reclen > (char*)dir->_DIR_buff + sizeof(dir->_DIR_buff) )
goto Bad; goto Bad;
if ( !memchr( entry->d_name, 0, entry->d_reclen - offsetof(struct dirent, d_name)) ) if ( !memchr( entry->d_name, 0, reclen - offsetof(struct dirent, d_name)) )
goto Bad; goto Bad;
#endif
dir->_DIR_next = (struct dirent*)((char*)entry + entry->d_reclen); dir->_DIR_next = (struct dirent*)((char*)entry + entry->d_reclen);
dir->_DIR_avail -= entry->d_reclen; dir->_DIR_avail -= entry->d_reclen;