This is the mail archive of the
mailing list for the glibc project.
[PATCH v2 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: Fri, 22 Dec 2017 20:31:01 +0100
- Subject: [PATCH v2 3/3] scandir: fix wrong assumption about errno [BZ #17804]
- Authentication-results: sourceware.org; auth=none
- References: <firstname.lastname@example.org>
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.
* dirent/scandir-tail.c (SCANDIR_TAIL): Move __set_errno (0) at the
end of the loop. Improve comments.
ChangeLog | 6 ++++++
dirent/scandir-tail.c | 13 ++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8368b3006d..713c5ade6d 100644
@@ -1,3 +1,9 @@
+2017-12-22 Aurelien Jarno <email@example.com>
+ [BZ #17804]
+ * dirent/scandir-tail.c (SCANDIR_TAIL): Move __set_errno (0) at the
+ end of the loop. Improve comments.
2017-12-22 Zack Weinberg <firstname.lastname@example.org>
diff --git a/dirent/scandir-tail.c b/dirent/scandir-tail.c
index 068c644c4e..927791fad0 100644
@@ -53,16 +53,14 @@ SCANDIR_TAIL (DIR *dp,
int selected = (*select) (d);
- /* The SELECT function might have changed errno. It was
- zero before and it need to be again to make the later
- tests work. */
+ /* The SELECT function might have set errno to non-zero on
+ success. It was zero before and it need to be again to
+ make the later tests work. */
- __set_errno (0);
if (__glibc_unlikely (c.cnt == vsize))
@@ -81,6 +79,11 @@ SCANDIR_TAIL (DIR *dp,
if (vnew == NULL)
v[c.cnt++] = (DIRENT_TYPE *) memcpy (vnew, d, dsize);
+ /* Ignore errors from readdir, malloc or realloc. These functions
+ might have set errno to non-zero on success. It was zero before
+ and it need to be again to make the latter tests work. */
+ __set_errno (0);
if (__glibc_likely (errno == 0))