summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--login/programs/pt_chown.c8
-rw-r--r--sysdeps/unix/sysv/linux/ptsname.c35
-rw-r--r--sysdeps/unix/sysv/linux/pty-private.h45
4 files changed, 45 insertions, 52 deletions
diff --git a/ChangeLog b/ChangeLog
index e31a5b78b7..5aefb11252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-08-25 Mark Kettenis <kettenis@gnu.org>
+
+ * sysdeps/unix/sysv/linux/ptsname.c: Add checks to make sure we're
+ really dealing with a master pseudo terminal, and really returning
+ the name of the associated slave pseudo terminal by checking the
+ device number.
+ * sysdeps/unix/sysv/linux/pty-private.h: Removed.
+ * login/programs/pt_chown.c (do_pt_chown): Don't use unix98_pseudo_p.
+
1999-08-25 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/sysv/linux/mips/syscalls.list: Add missing
diff --git a/login/programs/pt_chown.c b/login/programs/pt_chown.c
index 4b0768c04c..faec86b549 100644
--- a/login/programs/pt_chown.c
+++ b/login/programs/pt_chown.c
@@ -109,13 +109,7 @@ do_pt_chown (void)
/* Check that the returned slave pseudo terminal is a
character device. */
- if (stat (pty, &st) < 0
-#ifdef unix98_pseudo_p
- || ! unix98_pseudo_p (major (st.st_rdev))
-#else
- || !S_ISCHR(st.st_mode)
-#endif
- )
+ if (stat (pty, &st) < 0 || !S_ISCHR(st.st_mode))
return FAIL_EINVAL;
/* Get the group ID of the special `tty' group. */
diff --git a/sysdeps/unix/sysv/linux/ptsname.c b/sysdeps/unix/sysv/linux/ptsname.c
index 5852e2b295..10365792dd 100644
--- a/sysdeps/unix/sysv/linux/ptsname.c
+++ b/sysdeps/unix/sysv/linux/ptsname.c
@@ -29,6 +29,23 @@
#include <stdio-common/_itoa.h>
+/* Check if DEV corresponds to a master pseudo terminal device. */
+#define MASTER_P(Dev) \
+ (major ((Dev)) == 2 \
+ || (major ((Dev)) == 4 && minor ((Dev)) >= 128 && minor ((Dev)) < 192) \
+ || (major ((Dev)) >= 128 && major ((Dev)) < 136))
+
+/* Check if DEV corresponds to a master pseudo terminal device. */
+#define SLAVE_P(Dev) \
+ (major ((Dev)) == 3 \
+ || (major ((Dev)) == 4 && minor ((Dev)) >= 192 && minor ((Dev)) < 256) \
+ || (major ((Dev)) >= 136 && major ((Dev)) < 144))
+
+/* Note that major number 4 corresponds to the old BSD style pseudo
+ terminal devices. As of Linux 2.1.115 these are no longer
+ supported. They have been replaced by major numbers 2 (masters)
+ and 3 (slaves). */
+
/* Directory where we can find the slave pty nodes. */
#define _PATH_DEVPTS "/dev/pts/"
@@ -107,7 +124,16 @@ __ptsname_r (int fd, char *buf, size_t buflen)
if (__fstat (fd, &st) < 0)
return errno;
+ /* Check if FD really is a master pseudo terminal. */
+ if (! MASTER_P (st.st_rdev))
+ {
+ __set_errno (ENOTTY);
+ return ENOTTY;
+ }
+
ptyno = minor (st.st_rdev);
+ /* This is for the old BSD pseudo terminals. As of Linux
+ 2.1.115 these are no longer supported. */
if (major (st.st_rdev) == 4)
ptyno -= 128;
@@ -126,6 +152,15 @@ __ptsname_r (int fd, char *buf, size_t buflen)
if (__xstat (_STAT_VER, buf, &st) < 0)
return errno;
+ /* Check if the name we're about to return really corresponds to a
+ slave pseudo terminal. */
+ if (! S_ISCHR (st.st_mode) || ! SLAVE_P (st.st_rdev))
+ {
+ /* This really is a configuration problem. */
+ __set_errno (ENOTTY);
+ return ENOTTY;
+ }
+
__set_errno (save_errno);
return 0;
}
diff --git a/sysdeps/unix/sysv/linux/pty-private.h b/sysdeps/unix/sysv/linux/pty-private.h
deleted file mode 100644
index a883e80c46..0000000000
--- a/sysdeps/unix/sysv/linux/pty-private.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Internal defenitions and declarations for pseudo terminal functions.
- Copyright (C) 1998, 1999 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#ifndef _PTY_PRIVATE_H
-#define _PTY_PRIVATE_H 1
-
-/* The group slave pseudo terminals belong to. */
-#define TTY_GROUP "tty"
-
-/* The file descriptor connected to the master pseudo terminal. */
-#define PTY_FILENO 3
-
-/* Path to the helper program that implements `grantpt' in user space. */
-#define _PATH_PT_CHOWN LIBEXECDIR "/pt_chown"
-
-/* Test whether given TTY is really a Unix98 pseudo terminal. */
-#define unix98_pseudo_p(Dev) ((Dev) >= 136 && (Dev) <= 143)
-
-/* Exit codes for the helper program. */
-enum /* failure modes */
-{
- FAIL_EBADF = 1,
- FAIL_EINVAL,
- FAIL_EACCES,
- FAIL_EXEC
-};
-
-#endif /* pty-private.h */