diff --git a/lib/libc/inet/inet_network.c b/lib/libc/inet/inet_network.c index b464656369f0..254db41acb2d 100644 --- a/lib/libc/inet/inet_network.c +++ b/lib/libc/inet/inet_network.c @@ -1,111 +1,111 @@ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include __FBSDID("$FreeBSD$"); #include "port_before.h" #include #include #include #include #include "port_after.h" /*% * Internet network address interpretation routine. * The library routines call this routine to interpret * network numbers. */ in_addr_t inet_network(cp) const char *cp; { in_addr_t val, base, n; char c; in_addr_t parts[4], *pp = parts; int i, digit; again: val = 0; base = 10; digit = 0; if (*cp == '0') digit = 1, base = 8, cp++; if (*cp == 'x' || *cp == 'X') base = 16, cp++; while ((c = *cp) != 0) { if (isdigit((unsigned char)c)) { if (base == 8U && (c == '8' || c == '9')) return (INADDR_NONE); val = (val * base) + (c - '0'); cp++; digit = 1; continue; } if (base == 16U && isxdigit((unsigned char)c)) { val = (val << 4) + (c + 10 - (islower((unsigned char)c) ? 'a' : 'A')); cp++; digit = 1; continue; } break; } if (!digit) return (INADDR_NONE); + if (pp >= parts + 4 || val > 0xffU) + return (INADDR_NONE); if (*cp == '.') { - if (pp >= parts + 4 || val > 0xffU) - return (INADDR_NONE); *pp++ = val, cp++; goto again; } if (*cp && !isspace(*cp&0xff)) return (INADDR_NONE); *pp++ = val; n = pp - parts; if (n > 4U) return (INADDR_NONE); for (val = 0, i = 0; i < n; i++) { val <<= 8; val |= parts[i] & 0xff; } return (val); } /* * Weak aliases for applications that use certain private entry points, * and fail to include . */ #undef inet_network __weak_reference(__inet_network, inet_network); /*! \file */ diff --git a/lib/libc/stdlib/grantpt.c b/lib/libc/stdlib/grantpt.c index 0ce89fc837e3..ae491277ea8f 100644 --- a/lib/libc/stdlib/grantpt.c +++ b/lib/libc/stdlib/grantpt.c @@ -1,303 +1,292 @@ /* * Copyright (c) 2002 The FreeBSD Project, Inc. * All rights reserved. * * This software includes code contributed to the FreeBSD Project * by Ryan Younce of North Carolina State University. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the FreeBSD Project nor the names of its * contributors may be used to endorse or promote products derived from * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT AND CONTRIBUTORS ``AS IS'' * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE FREEBSD PROJECT OR ITS CONTRIBUTORS * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ #include #ifndef lint __FBSDID("$FreeBSD$"); #endif /* not lint */ #include "namespace.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "un-namespace.h" #define PTYM_PREFIX "pty" /* pty(4) master naming convention */ #define PTYS_PREFIX "tty" /* pty(4) slave naming convention */ #define PTMXM_PREFIX "ptc/" /* pts(4) master naming convention */ #define PTMXS_PREFIX "pts/" /* pts(4) slave naming convention */ #define PTMX "ptmx" /* * The following are range values for pseudo TTY devices. Pseudo TTYs have a * name of /dev/[pt]ty[l-sL-S][0-9a-v], yielding 256 combinations per major. */ #define PTY_MAX 256 #define PTY_DEV1 "pqrsPQRSlmnoLMNO" #define PTY_DEV2 "0123456789abcdefghijklmnopqrstuv" /* * grantpt(3) support utility. */ #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) { int use_pts; size_t len; int error; len = sizeof(use_pts); error = sysctlbyname("kern.pts.enable", &use_pts, &len, NULL, 0); if (error) { struct stat sb; if (stat(_PATH_DEV PTMX, &sb) != 0) return (0); use_pts = 1; } return (use_pts); } /* * grantpt(): grant ownership of a slave pseudo-terminal device to the * current user. */ int grantpt(int fildes) { int retval, serrno, status; pid_t pid, spid; gid_t gid; char *slave; sigset_t oblock, nblock; struct group *grp; retval = -1; serrno = errno; if ((slave = ptsname(fildes)) != NULL) { /* * Block SIGCHLD. */ (void)sigemptyset(&nblock); (void)sigaddset(&nblock, SIGCHLD); (void)_sigprocmask(SIG_BLOCK, &nblock, &oblock); switch (pid = fork()) { case -1: break; case 0: /* child */ /* * pt_chown expects the master pseudo TTY to be its * standard input. */ (void)_dup2(fildes, STDIN_FILENO); (void)_sigprocmask(SIG_SETMASK, &oblock, NULL); execl(_PATH_PTCHOWN, _PATH_PTCHOWN, (char *)NULL); _exit(EX_UNAVAILABLE); /* NOTREACHED */ default: /* parent */ /* * Just wait for the process. Error checking is * done below. */ while ((spid = _waitpid(pid, &status, 0)) == -1 && (errno == EINTR)) ; if (spid != -1 && WIFEXITED(status) && WEXITSTATUS(status) == EX_OK) retval = 0; else errno = EACCES; break; } /* * Restore process's signal mask. */ (void)_sigprocmask(SIG_SETMASK, &oblock, NULL); if (retval) { /* * pt_chown failed. Try to manually change the * permissions for the slave. */ gid = (grp = getgrnam("tty")) ? grp->gr_gid : -1; if (chown(slave, getuid(), gid) == -1 || chmod(slave, S_IRUSR | S_IWUSR | S_IWGRP) == -1) errno = EACCES; else retval = 0; } } if (!retval) errno = serrno; return (retval); } /* * posix_openpt(): open the first available master pseudo-terminal device * and return descriptor. */ int posix_openpt(int oflag) { char *mc1, *mc2, master[] = _PATH_DEV PTYM_PREFIX "XY"; const char *pc1, *pc2; int fildes, bflag, serrno; fildes = -1; bflag = 0; serrno = errno; /* * Check flag validity. POSIX doesn't require it, * but we still do so. */ if (oflag & ~(O_RDWR | O_NOCTTY)) errno = EINVAL; else { if (__use_pts()) { fildes = _open(_PATH_DEV PTMX, oflag); return (fildes); } mc1 = master + strlen(_PATH_DEV PTYM_PREFIX); mc2 = mc1 + 1; /* Cycle through all possible master PTY devices. */ for (pc1 = PTY_DEV1; !bflag && (*mc1 = *pc1); ++pc1) for (pc2 = PTY_DEV2; (*mc2 = *pc2) != '\0'; ++pc2) { /* * Break out if we successfully open a PTY, * or if open() fails due to limits. */ if ((fildes = _open(master, oflag)) != -1 || (errno == EMFILE || errno == ENFILE)) { ++bflag; break; } } if (fildes != -1) errno = serrno; else if (!bflag) errno = EAGAIN; } return (fildes); } /* * ptsname(): return the pathname of the slave pseudo-terminal device * associated with the specified master. */ char * ptsname(int fildes) { static char pty_slave[] = _PATH_DEV PTYS_PREFIX "XY"; +#if 0 static char ptmx_slave[] = _PATH_DEV PTMXS_PREFIX "4294967295"; - char *retval; +#endif + const char *master; struct stat sbuf; - - 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; - } - } +#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); } - - return (retval); +#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); } /* * unlockpt(): unlock a pseudo-terminal device pair. */ 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 ((retval = _fstat(fildes, &sbuf)) == 0 && !ISPTM(sbuf)) { - errno = EINVAL; - retval = -1; - } + if (ptsname(fildes) == NULL) + return (-1); - return (retval); + return (0); } diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c index 1fe8be247207..15f258b844cd 100644 --- a/lib/libutil/pty.c +++ b/lib/libutil/pty.c @@ -1,180 +1,128 @@ /*- * Copyright (c) 1990, 1993, 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 static char sccsid[] = "@(#)pty.c 8.3 (Berkeley) 5/16/94"; #endif #endif /* LIBC_SCCS and not lint */ #include #include #include #include #include #include #include #include #include #include #include -int __use_pts(void); - -static int -new_openpty(int *amaster, int *aslave, char *name, struct termios *termp, +int +openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) { const char *slavename; int master, slave; master = posix_openpt(O_RDWR); if (master == -1) return (-1); if (grantpt(master) == -1) { close(master); return (-1); } slavename = ptsname(master); if (slavename == NULL) { close(master); return (-1); } if (revoke(slavename) == -1) { close(master); return (-1); } slave = open(slavename, O_RDWR); if (slave == -1) { close(master); return (-1); } if (unlockpt(master) == -1) { close(master); close(slave); return (-1); } *amaster = master; *aslave = slave; if (name) - strcpy(name, ptsname(master)); + strcpy(name, slavename); if (termp) tcsetattr(slave, TCSAFLUSH, termp); if (winp) ioctl(slave, TIOCSWINSZ, (char *)winp); return (0); } -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; if (openpty(&master, &slave, name, termp, winp) == -1) return (-1); switch (pid = fork()) { case -1: return (-1); case 0: /* * child */ (void) close(master); login_tty(slave); return (0); } /* * parent */ *amaster = master; (void) close(slave); return (pid); }