aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nptl/ChangeLog3
-rw-r--r--nptl/Makefile1
-rw-r--r--nptl/sysdeps/unix/sysv/linux/pthread_kill.c7
-rw-r--r--nptl/tst-basic7.c73
-rw-r--r--sysdeps/unix/sysv/linux/ttyname_r.c27
6 files changed, 104 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index c4072e3..638a35d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-18 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/ttyname_r.c (__ttyname_r): Recognize
+ invalid file descriptors and missing access permissions.
+
2003-02-17 Ulrich Drepper <drepper@redhat.com>
* nss/getXXbyYY_r.c (REENTRANT_NAME): Return 0 if no entry has
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 7f96519..0e8fe79 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,8 @@
2003-02-18 Ulrich Drepper <drepper@redhat.com>
+ * Makefile (tests): Add tst-basic7.
+ * tst-basic7.c: New file.
+
* pthread_create.c (deallocate_tsd): Mark as internal_function.
Add some more __builtin_expect.
diff --git a/nptl/Makefile b/nptl/Makefile
index c3b824a..24bb8de 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -137,6 +137,7 @@ tests = tst-attr1 tst-attr2 \
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 \
tst-barrier1 tst-barrier2 tst-barrier3 \
tst-basic1 tst-basic2 tst-basic3 tst-basic4 tst-basic5 tst-basic6 \
+ tst-basic7 \
tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 \
tst-tsd1 tst-tsd2 \
tst-fork1 tst-fork2 tst-fork3 \
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
index e1c79e7..ca6dfd8 100644
--- a/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_kill.c
@@ -36,9 +36,10 @@ __pthread_kill (threadid, signo)
/* The kernel returns EINVAL for PIDs <= 0. This is not nice since
the user would expect ESRCH. Correct it here. */
- int val = (pd->tid > 0
- ? INTERNAL_SYSCALL (tkill, err, 2, pd->tid, signo)
- : ESRCH);
+ if (pd->tid <= 0)
+ return ESRCH;
+
+ int val = INTERNAL_SYSCALL (tkill, err, 2, pd->tid, signo);
return (INTERNAL_SYSCALL_ERROR_P (val, err)
? INTERNAL_SYSCALL_ERRNO (val, err) : 0);
diff --git a/nptl/tst-basic7.c b/nptl/tst-basic7.c
new file mode 100644
index 0000000..7dc361a
--- /dev/null
+++ b/nptl/tst-basic7.c
@@ -0,0 +1,73 @@
+/* Copyright (C) 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+
+static void *
+tf (void *a)
+{
+ return NULL;
+}
+
+
+int
+do_test (void)
+{
+ pthread_t th;
+ if (pthread_create (&th, NULL, tf, NULL) != 0)
+ {
+ puts ("create failed");
+ exit (1);
+ }
+
+ if (pthread_join (th, NULL) != 0)
+ {
+ puts ("join failed");
+ exit (1);
+ }
+
+ /* The following only works because we assume here something about
+ the implementation. Namely, that the memory allocated for the
+ thread descriptor is not going away, that the the TID field is
+ cleared and therefore the signal is sent to process 0, and that
+ we can savely assume there is no other process with this ID at
+ that time. */
+ int e = pthread_kill (th, 0);
+ if (e == 0)
+ {
+ puts ("pthread_kill succeeded");
+ exit (1);
+ }
+ if (e != ESRCH)
+ {
+ puts ("pthread_kill didn't return ESRCH");
+ exit (1);
+ }
+
+ return 0;
+}
+
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
diff --git a/sysdeps/unix/sysv/linux/ttyname_r.c b/sysdeps/unix/sysv/linux/ttyname_r.c
index c23ded2..924b491 100644
--- a/sysdeps/unix/sysv/linux/ttyname_r.c
+++ b/sysdeps/unix/sysv/linux/ttyname_r.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,1995-1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,1995-2001, 2003 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
@@ -115,26 +115,35 @@ __ttyname_r (int fd, char *buf, size_t buflen)
return ERANGE;
}
+ /* We try using the /proc filesystem. */
+ *_fitoa_word (fd, __stpcpy (procname, "/proc/self/fd/"), 10, 0) = '\0';
+
+ ret = __readlink (procname, buf, buflen - 1);
+ if (ret == -1 && errno == ENOENT)
+ {
+ __set_errno (EBADF);
+ return EBADF;
+ }
+ if (ret == -1 && errno == EACCES)
+ return EACCES;
+
if (!__isatty (fd))
{
__set_errno (ENOTTY);
return ENOTTY;
}
- /* We try using the /proc filesystem. */
- *_fitoa_word (fd, __stpcpy (procname, "/proc/self/fd/"), 10, 0) = '\0';
+ if (ret == -1 && errno == ENAMETOOLONG)
+ {
+ __set_errno (ERANGE);
+ return ERANGE;
+ }
- ret = __readlink (procname, buf, buflen - 1);
if (ret != -1 && buf[0] != '[')
{
buf[ret] = '\0';
return 0;
}
- if (ret == -1 && errno == ENAMETOOLONG)
- {
- __set_errno (ERANGE);
- return ERANGE;
- }
if (__fxstat64 (_STAT_VER, fd, &st) < 0)
return errno;