about summary refs log tree commit diff
path: root/sysdeps/pthread/aio_cancel.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-06-29 23:35:02 +0000
committerUlrich Drepper <drepper@redhat.com>2002-06-29 23:35:02 +0000
commit8b8cc76fa47fe0819e5e52e29c6674e799df646e (patch)
treebf5c673ddb4307546d7e337c2722bc5a9f8352a1 /sysdeps/pthread/aio_cancel.c
parenteabea97226515d709064e07485caeb41d413ca44 (diff)
downloadglibc-8b8cc76fa47fe0819e5e52e29c6674e799df646e.tar.gz
glibc-8b8cc76fa47fe0819e5e52e29c6674e799df646e.tar.xz
glibc-8b8cc76fa47fe0819e5e52e29c6674e799df646e.zip
Update.
2002-06-18  Amos Waterland  <apw@us.ibm.com>

	* sysdeps/pthread/aio_cancel.c (aio_cancel): Add check for invalid
	file descriptor.
	* sysdeps/pthread/aio_fsync.c (aio_fsync): Add check for invalid fd;
	add check for fd not open for writing.

	* sysdeps/pthread/aio_suspend.c (aio_suspend): Add check for
	completed element(s) and do not suspend thread if so.  Patch
	heavily modified by drepper.

	* rt/tst-aio7.c: New file.  Regression test for problems which the
	above three changes fix.
	* rt/Makefile (tests): Add tst-aio7.

	* rt/tst-aio6.c: Fix comment.
Diffstat (limited to 'sysdeps/pthread/aio_cancel.c')
-rw-r--r--sysdeps/pthread/aio_cancel.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c
index c2fe6da9ee..d62586b903 100644
--- a/sysdeps/pthread/aio_cancel.c
+++ b/sysdeps/pthread/aio_cancel.c
@@ -1,5 +1,5 @@
 /* Cancel requests associated with given file descriptor.
-   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -43,6 +43,13 @@ aio_cancel (fildes, aiocbp)
   struct requestlist *req = NULL;
   int result = AIO_ALLDONE;
 
+  /* If fildes is invalid, error. */
+  if (fcntl (fildes, F_GETFL) < 0)
+    {
+      __set_errno (EBADF);
+      return -1;
+    }
+
   /* Request the mutex.  */
   pthread_mutex_lock (&__aio_requests_mutex);