This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 3/3] scandir: fix wrong assumption about errno [BZ #17804]
- From: Aurelien Jarno <aurelien at aurel32 dot net>
- To: libc-alpha at sourceware dot org
- Cc: Aurelien Jarno <aurelien at aurel32 dot net>
- Date: Thu, 21 Dec 2017 23:54:53 +0100
- Subject: [PATCH 3/3] scandir: fix wrong assumption about errno [BZ #17804]
- Authentication-results: sourceware.org; auth=none
- References: <20171221225453.13158-1-aurelien@aurel32.net>
malloc and realloc may set errno to ENOMEM even if they are successful.
The scandir code wrongly assume that they do not change errno, this
causes scandir to fail with ENOMEM even if malloc succeed.
The code already handles that readdir might set errno by calling
__set_errno (0) to clear the error. Move that part at the end of the
loop to also take malloc and realloc into account.
Changelog:
[BZ #17804]
* dirent/scandir-tail.c (SCANDIR_TAIL): Move __set_errno (0) at the
end of the loop.
---
ChangeLog | 6 ++++++
dirent/scandir-tail.c | 7 +++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7bf30d27ef..31fddf5794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-21 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #17804]
+ * dirent/scandir-tail.c (SCANDIR_TAIL): Move __set_errno (0) at the
+ end of the loop.
+
2017-12-21 Aurelien Jarno <aurelien@aurel32.net>
[BZ #22615]
diff --git a/dirent/scandir-tail.c b/dirent/scandir-tail.c
index 068c644c4e..00fe9ef030 100644
--- a/dirent/scandir-tail.c
+++ b/dirent/scandir-tail.c
@@ -61,8 +61,6 @@ SCANDIR_TAIL (DIR *dp,
if (!selected)
continue;
}
- else
- __set_errno (0);
if (__glibc_unlikely (c.cnt == vsize))
{
@@ -81,6 +79,11 @@ SCANDIR_TAIL (DIR *dp,
if (vnew == NULL)
break;
v[c.cnt++] = (DIRENT_TYPE *) memcpy (vnew, d, dsize);
+
+ /* Ignore errors from readdir, malloc or realloc. These functions
+ might have changed errno. It was zero before and it need to be
+ again to make the latter tests work. */
+ __set_errno (0);
}
if (__glibc_likely (errno == 0))
--
2.15.1