AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux: readdir_r needs to report getdents failures (bug 32124)

Browse Source 
Upon error, return the errno value set by the __getdents call
in __readdir_unlocked.  Previously, kernel-reported errors
were ignored.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Florian Weimer 2024-08-30 21:52:23 +02:00
parent 3b1d321776
commit 61f2c2e1d1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysdeps/unix/sysv/linux/readdir_r.c
View File

@ -25,14 +25,22 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
{
struct dirent *dp;
size_t reclen;
int saved_errno = errno;
__libc_lock_lock (dirp->lock);
while (1)
{
/* If errno is changed from 0, the NULL return value indicates
an actual error. It overrides a pending ENAMETOOLONG error. */
__set_errno (0);
dp = __readdir_unlocked (dirp);
if (dp == NULL)
break;
{
if (errno != 0)
dirp->errcode = errno;
break;
}
reclen = dp->d_reclen;
if (reclen <= offsetof (struct dirent, d_name) + NAME_MAX + 1)
@ -61,6 +69,7 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
__libc_lock_unlock (dirp->lock);
__set_errno (saved_errno);
return dp != NULL ? 0 : dirp->errcode;
}