Back out last commit, since it accidentally broke pts.

The security fix will be re-committed soon, hopefully without breaking
anything.

2 files changed, 103 insertions, 40 deletions

diff --git a/lib/libc/stdlib/grantpt.c b/lib/libc/stdlib/grantpt.c
index ae49127..0ce89fc 100644
--- a/lib/libc/stdlib/grantpt.c
+++ b/lib/libc/stdlib/grantpt.c
@@ -75,6 +75,23 @@ __FBSDID("$FreeBSD$");
  */
 #define _PATH_PTCHOWN	"/usr/libexec/pt_chown"
 
+/*
+ * ISPTM(x) returns 0 for struct stat x if x is not a pty master.
+ * The bounds checking may be unnecessary but it does eliminate doubt.
+ */
+#define ISPTM(x)	(S_ISCHR((x).st_mode) && 			\
+			 minor((x).st_rdev) >= 0 &&			\
+			 minor((x).st_rdev) < PTY_MAX)
+
+
+static int
+is_pts(int fd)
+{
+	int nb;
+
+	return (_ioctl(fd, TIOCGPTN, &nb) == 0);
+}
+
 int
 __use_pts(void)
 {
@@ -234,43 +251,33 @@ char *
 ptsname(int fildes)
 {
 	static char pty_slave[] = _PATH_DEV PTYS_PREFIX "XY";
-#if 0
 	static char ptmx_slave[] = _PATH_DEV PTMXS_PREFIX "4294967295";
-#endif
-	const char *master;
+	char *retval;
 	struct stat sbuf;
-#if 0
-	int ptn;
-
-	/* Handle pts(4) masters first. */
-	if (_ioctl(fildes, TIOCGPTN, &ptn) == 0) {
-		(void)snprintf(ptmx_slave, sizeof(ptmx_slave),
-		    _PATH_DEV PTMXS_PREFIX "%d", ptn);
-		return (ptmx_slave);
+
+	retval = NULL;
+
+	if (_fstat(fildes, &sbuf) == 0) {
+		if (!ISPTM(sbuf))
+			errno = EINVAL;
+		else {
+			if (!is_pts(fildes)) {
+				(void)snprintf(pty_slave, sizeof(pty_slave),
+					       _PATH_DEV PTYS_PREFIX "%s",
+					       devname(sbuf.st_rdev, S_IFCHR) +
+					       strlen(PTYM_PREFIX));
+				retval = pty_slave;
+			} else {
+				(void)snprintf(ptmx_slave, sizeof(ptmx_slave),
+					       _PATH_DEV PTMXS_PREFIX "%s",
+					       devname(sbuf.st_rdev, S_IFCHR) +
+					       strlen(PTMXM_PREFIX));
+				retval = ptmx_slave;
+			}
+		}
 	}
-#endif
-
-	/* All master pty's must be char devices. */
-	if (_fstat(fildes, &sbuf) == -1)
-		goto invalid;
-	if (!S_ISCHR(sbuf.st_mode))
-		goto invalid;
-
-	/* Check to see if this device is a pty(4) master. */
-	master = devname(sbuf.st_rdev, S_IFCHR);
-	if (strlen(master) != strlen(PTYM_PREFIX "XY"))
-		goto invalid;
-	if (strncmp(master, PTYM_PREFIX, strlen(PTYM_PREFIX)) != 0)
-		goto invalid;
-
-	/* It is, so generate the corresponding pty(4) slave name. */
-	(void)snprintf(pty_slave, sizeof(pty_slave), _PATH_DEV PTYS_PREFIX "%s",
-	    master + strlen(PTYM_PREFIX));
-	return (pty_slave);
-
-invalid:
-	errno = EINVAL;
-	return (NULL);
+
+	return (retval);
 }
 
 /*
@@ -279,14 +286,18 @@ invalid:
 int
 unlockpt(int fildes)
 {
+	int retval;
+	struct stat sbuf;
 
 	/*
 	 * Unlocking a master/slave pseudo-terminal pair has no meaning in a
 	 * non-streams PTY environment.  However, we do ensure fildes is a
 	 * valid master pseudo-terminal device.
 	 */
-	if (ptsname(fildes) == NULL)
-		return (-1);
+	if ((retval = _fstat(fildes, &sbuf)) == 0 && !ISPTM(sbuf)) {
+		errno = EINVAL;
+		retval = -1;
+	}
 
-	return (0);
+	return (retval);
 }
diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c
index 15f258b..1fe8be2 100644
--- a/lib/libutil/pty.c
+++ b/lib/libutil/pty.c
@@ -49,8 +49,10 @@ static char sccsid[] = "@(#)pty.c	8.3 (Berkeley) 5/16/94";
 #include <termios.h>
 #include <unistd.h>
 
-int
-openpty(int *amaster, int *aslave, char *name, struct termios *termp,
+int __use_pts(void);
+
+static int
+new_openpty(int *amaster, int *aslave, char *name, struct termios *termp,
     struct winsize *winp)
 {
 	const char *slavename;
@@ -92,7 +94,7 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp,
 	*aslave = slave;
 
 	if (name)
-		strcpy(name, slavename);
+		strcpy(name, ptsname(master));
 	if (termp)
 		tcsetattr(slave, TCSAFLUSH, termp);
 	if (winp)
@@ -102,6 +104,56 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp,
 }
 
 int
+openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp)
+{
+	char line[] = "/dev/ptyXX";
+	const char *cp1, *cp2;
+	int master, slave, ttygid;
+	struct group *gr;
+
+	if (__use_pts())
+		return (new_openpty(amaster, aslave, name, termp, winp));
+
+	if ((gr = getgrnam("tty")) != NULL)
+		ttygid = gr->gr_gid;
+	else
+		ttygid = -1;
+
+	for (cp1 = "pqrsPQRSlmnoLMNO"; *cp1; cp1++) {
+		line[8] = *cp1;
+		for (cp2 = "0123456789abcdefghijklmnopqrstuv"; *cp2; cp2++) {
+			line[5] = 'p';
+			line[9] = *cp2;
+			if ((master = open(line, O_RDWR, 0)) == -1) {
+				if (errno == ENOENT)
+					break; /* try the next pty group */
+			} else {
+				line[5] = 't';
+				(void) chown(line, getuid(), ttygid);
+				(void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP);
+				(void) revoke(line);
+				if ((slave = open(line, O_RDWR, 0)) != -1) {
+					*amaster = master;
+					*aslave = slave;
+					if (name)
+						strcpy(name, line);
+					if (termp)
+						(void) tcsetattr(slave,
+							TCSAFLUSH, termp);
+					if (winp)
+						(void) ioctl(slave, TIOCSWINSZ,
+							(char *)winp);
+					return (0);
+				}
+				(void) close(master);
+			}
+		}
+	}
+	errno = ENOENT;	/* out of ptys */
+	return (-1);
+}
+
+int
 forkpty(int *amaster, char *name, struct termios *termp, struct winsize *winp)
 {
 	int master, slave, pid;