lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
Code Activity

Linux: readdir64_r should not skip d_ino == 0 entries (bug 32126)

Browse Source 
This is the same bug as bug 12165, but for readdir_r.  The
regression test covers both bug 12165 and bug 32126.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Florian Weimer
2024-09-21 19:32:34 +02:00
parent 6aa1645f66
commit 6f3f6c506c
3 changed files with 147 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
sysdeps/unix/sysv/linux/readdir64_r.c
View File

@@ -37,7 +37,7 @@ __readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
__libc_lock_lock (dirp->lock);
do
while (1)
{
if (dirp->offset >= dirp->size)
{
@@ -79,26 +79,21 @@ __readdir64_r (DIR *dirp, struct dirent64 *entry, struct dirent64 **result)
dirp->filepos = dp->d_off;
if (reclen > offsetof (struct dirent64, d_name) + NAME_MAX + 1)
if (reclen <= offsetof (struct dirent64, d_name) + NAME_MAX + 1)
break;
/* The record is very long. It could still fit into the
caller-supplied buffer if we can skip padding at the end. */
size_t namelen = _D_EXACT_NAMLEN (dp);
if (namelen <= NAME_MAX)
{
/* The record is very long. It could still fit into the
caller-supplied buffer if we can skip padding at the
end. */
size_t namelen = _D_EXACT_NAMLEN (dp);
if (namelen <= NAME_MAX)
reclen = offsetof (struct dirent64, d_name) + namelen + 1;
else
{
/* The name is too long. Ignore this file. */
dirp->errcode = ENAMETOOLONG;
dp->d_ino = 0;
continue;
}
reclen = offsetof (struct dirent64, d_name) + namelen + 1;
break;
}
/* Skip deleted and ignored files. */
/* The name is too long. Ignore this file. */
dirp->errcode = ENAMETOOLONG;
}
while (dp->d_ino == 0);
if (dp != NULL)
{