summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-06-22 05:58:14 +0000
committerUlrich Drepper <drepper@redhat.com>2002-06-22 05:58:14 +0000
commit05ae4d6ad95c139aacbc16ed6b50a24678d01bf8 (patch)
tree1f1177f5fc84f9bd51c7966e1e3e36a044b3843b
parentbff334e09023c8cf6327e9ff87b117f2331330d2 (diff)
downloadglibc-05ae4d6ad95c139aacbc16ed6b50a24678d01bf8.tar.gz
Update.
2002-06-21 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/getdents.c [__ASSUME_GETDENTS64_SYSCALL] (__GETDENTS): Check for failed getdents64 syscall. * dirent/Makefile (tests): Add bug-readdir1. * dirent/bug-readdir1.c: New file.
-rw-r--r--ChangeLog7
-rw-r--r--dirent/Makefile4
-rw-r--r--dirent/bug-readdir1.c36
-rw-r--r--sysdeps/unix/sysv/linux/getdents.c6
4 files changed, 50 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c0bfdf7b9b..e54e6409eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-21 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/getdents.c [__ASSUME_GETDENTS64_SYSCALL]
+ (__GETDENTS): Check for failed getdents64 syscall.
+ * dirent/Makefile (tests): Add bug-readdir1.
+ * dirent/bug-readdir1.c: New file.
+
2002-06-17 Jakub Jelinek <jakub@redhat.com>
* elf/dl-lookup.c (_dl_debug_bindings): Use type_class 4 for TLS
diff --git a/dirent/Makefile b/dirent/Makefile
index a88a85b63e..481141136b 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
+# Copyright (C) 1991-2000, 2002 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -28,7 +28,7 @@ routines := opendir closedir readdir readdir_r rewinddir \
alphasort64 versionsort64
distribute := dirstream.h
-tests := list tst-seekdir opendir-tst1
+tests := list tst-seekdir opendir-tst1 bug-readdir1
include ../Rules
diff --git a/dirent/bug-readdir1.c b/dirent/bug-readdir1.c
new file mode 100644
index 0000000000..f9c609cc98
--- /dev/null
+++ b/dirent/bug-readdir1.c
@@ -0,0 +1,36 @@
+#include <dirent.h>
+#include <errno.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+
+int
+main (void)
+{
+ DIR *dirp;
+ struct dirent* ent;
+
+ /* open a dir stream */
+ dirp = opendir ("/tmp");
+ if (dirp == NULL)
+ {
+ if (errno == ENOENT)
+ exit (0);
+
+ perror ("opendir");
+ exit (1);
+ }
+
+ /* close the dir stream, making it invalid */
+ if (closedir (dirp))
+ {
+ perror ("closedir");
+ exit (1);
+ }
+
+ ent = readdir (dirp);
+
+ return ent != NULL || errno != EBADF;
+}
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index 5d79a3a4d0..6dc9d714b5 100644
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993,95,96,97,98,99,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995-2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -129,6 +129,10 @@ __GETDENTS (int fd, char *buf, size_t nbytes)
const size_t size_diff = (offsetof (struct kernel_dirent64, d_name)
- offsetof (DIRENT_TYPE, d_name));
+ /* Return the error if encountered. */
+ if (retval == -1)
+ return -1;
+
/* If the structure returned by the kernel is identical to what we
need, don't do any conversions. */
if (offsetof (DIRENT_TYPE, d_name)