X-Git-Url: http://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Ftty.c;h=991a148de0cfe1417a98d14dac16d8d3eeab1ebd;hp=f2454279fedb5b17d10af6630b69e1b0c457a68a;hb=25bd6734790c31d9f239ccac2aa1218ee071f6d0;hpb=37a8acc7ee2527693d0c8ba82b2eaea249abde34 diff --git a/pppd/tty.c b/pppd/tty.c index f245427..991a148 100644 --- a/pppd/tty.c +++ b/pppd/tty.c @@ -1,26 +1,74 @@ /* * tty.c - code for handling serial ports in pppd. * - * Copyright (C) 2000 Paul Mackerras. - * All rights reserved. + * Copyright (C) 2000-2004 Paul Mackerras. All rights reserved. * - * Portions Copyright (c) 1989 Carnegie Mellon University. - * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: * - * Redistribution and use in source and binary forms are permitted - * provided that the above copyright notice and this paragraph are - * duplicated in all such forms and that any documentation, - * advertising materials, and other materials related to such - * distribution and use acknowledge that the software was developed - * by Carnegie Mellon University. The name of the - * University may not be used to endorse or promote products derived - * from this software without specific prior written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED - * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. The name(s) of the authors of this software must not be used to + * endorse or promote products derived from this software without + * prior written permission. + * + * 3. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Paul Mackerras + * ". + * + * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * Portions derived from main.c, which is: + * + * Copyright (c) 1984-2000 Carnegie Mellon University. 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. + * + * 3. The name "Carnegie Mellon University" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For permission or any legal + * details, please contact + * Office of Technology Transfer + * Carnegie Mellon University + * 5000 Forbes Avenue + * Pittsburgh, PA 15213-3890 + * (412) 268-4387, fax: (412) 268-7395 + * tech-transfer@andrew.cmu.edu + * + * 4. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by Computing Services + * at Carnegie Mellon University (http://www.cmu.edu/computing/)." + * + * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE + * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN + * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: tty.c,v 1.5 2001/03/08 05:11:16 paulus Exp $" +#define RCSID "$Id: tty.c,v 1.20 2004/11/12 09:51:23 paulus Exp $" #include #include @@ -197,6 +245,8 @@ struct channel tty_channel = { &tty_check_options, &connect_tty, &disconnect_tty, + &tty_establish_ppp, + &tty_disestablish_ppp, &tty_do_send_config, &tty_recv_config, &cleanup_tty, @@ -245,7 +295,7 @@ setdevname(cp, argv, doit) if (*cp == 0) return 0; - if (strncmp("/dev/", cp, 5) != 0) { + if (*cp != '/') { strlcpy(dev, "/dev/", sizeof(dev)); strlcat(dev, cp, sizeof(dev)); cp = dev; @@ -404,7 +454,7 @@ tty_check_options() if (using_pty) { if (!default_device) { option_error("%s option precludes specifying device name", - notty? "notty": "pty"); + pty_socket? "socket": notty? "notty": "pty"); exit(EXIT_OPTION_ERROR); } if (ptycommand != NULL && notty) { @@ -457,7 +507,9 @@ int connect_tty() { char *connector; int fdflags; +#ifndef __linux__ struct stat statbuf; +#endif char numbuf[16]; /* @@ -483,7 +535,7 @@ int connect_tty() status = EXIT_LOCK_FAILED; if (lockflag && !privopen) { if (lock(devnam) < 0) - return -1; + goto errret; locked = 1; } @@ -506,11 +558,11 @@ int connect_tty() prio = privopen? OPRIO_ROOT: tty_options[0].priority; if (prio < OPRIO_ROOT) seteuid(uid); - ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); + real_ttyfd = open(devnam, O_NONBLOCK | O_RDWR, 0); err = errno; if (prio < OPRIO_ROOT) seteuid(0); - if (ttyfd >= 0) + if (real_ttyfd >= 0) break; errno = err; if (err != EINTR) { @@ -518,13 +570,18 @@ int connect_tty() status = EXIT_OPEN_FAILED; } if (!persist || err != EINTR) - return -1; + goto errret; } - real_ttyfd = ttyfd; + ttyfd = real_ttyfd; if ((fdflags = fcntl(ttyfd, F_GETFL)) == -1 || fcntl(ttyfd, F_SETFL, fdflags & ~O_NONBLOCK) < 0) warn("Couldn't reset non-blocking mode on device: %m"); +#ifndef __linux__ + /* + * Linux 2.4 and above blocks normal writes to the tty + * when it is in PPP line discipline, so this isn't needed. + */ /* * Do the equivalent of `mesg n' to stop broadcast messages. */ @@ -533,6 +590,7 @@ int connect_tty() warn("Couldn't restrict write permissions to %s: %m", devnam); } else tty_mode = statbuf.st_mode; +#endif /* __linux__ */ /* * Set line speed, flow control, etc. @@ -559,6 +617,11 @@ int connect_tty() if (pipe(ipipe) < 0 || pipe(opipe) < 0) fatal("Couldn't create pipes for record option: %m"); + + /* don't leak these to the ptycommand */ + (void) fcntl(ipipe[0], F_SETFD, FD_CLOEXEC); + (void) fcntl(opipe[1], F_SETFD, FD_CLOEXEC); + ok = device_script(ptycommand, opipe[0], ipipe[1], 1) == 0 && start_charshunt(ipipe[0], opipe[1]); close(ipipe[0]); @@ -566,26 +629,37 @@ int connect_tty() close(opipe[0]); close(opipe[1]); if (!ok) - return -1; + goto errret; } else { if (device_script(ptycommand, pty_master, pty_master, 1) < 0) - return -1; - ttyfd = pty_slave; - close(pty_master); - pty_master = -1; + goto errret; } } else if (pty_socket != NULL) { int fd = open_socket(pty_socket); if (fd < 0) - return -1; + goto errret; if (!start_charshunt(fd, fd)) - return -1; + goto errret; + close(fd); } else if (notty) { if (!start_charshunt(0, 1)) - return -1; + goto errret; + dup2(fd_devnull, 0); + dup2(fd_devnull, 1); + if (log_to_fd == 1) + log_to_fd = -1; + if (log_to_fd != 2) + dup2(fd_devnull, 2); } else if (record_file != NULL) { - if (!start_charshunt(ttyfd, ttyfd)) - return -1; + int fd = dup(ttyfd); + if (!start_charshunt(fd, fd)) + goto errret; + } + + if (using_pty || record_file != NULL) { + ttyfd = pty_slave; + close(pty_master); + pty_master = -1; } /* run connection script */ @@ -603,11 +677,11 @@ int connect_tty() if (device_script(initializer, ttyfd, ttyfd, 0) < 0) { error("Initializer script failed"); status = EXIT_INIT_FAILED; - return -1; + goto errret; } if (kill_link) { disconnect_tty(); - return -1; + goto errret; } info("Serial port initialized."); } @@ -616,11 +690,11 @@ int connect_tty() if (device_script(connector, ttyfd, ttyfd, 0) < 0) { error("Connect script failed"); status = EXIT_CONNECT_FAILED; - return -1; + goto errret; } if (kill_link) { disconnect_tty(); - return -1; + goto errret; } info("Serial connection established."); } @@ -645,7 +719,7 @@ int connect_tty() status = EXIT_OPEN_FAILED; } if (!persist || errno != EINTR || hungup || kill_link) - return -1; + goto errret; } close(i); } @@ -668,6 +742,22 @@ int connect_tty() listen_time = connect_delay; return ttyfd; + + errret: + if (pty_master >= 0) { + close(pty_master); + pty_master = -1; + } + if (pty_slave >= 0) { + close(pty_slave); + pty_slave = -1; + } + if (real_ttyfd >= 0) { + close(real_ttyfd); + real_ttyfd = -1; + } + ttyfd = -1; + return -1; } @@ -686,8 +776,6 @@ void disconnect_tty() void tty_close_fds() { - if (pty_master >= 0) - close(pty_master); if (pty_slave >= 0) close(pty_slave); if (real_ttyfd >= 0) { @@ -740,12 +828,12 @@ finish_tty() restore_tty(real_ttyfd); +#ifndef __linux__ if (tty_mode != (mode_t) -1) { - if (fchmod(real_ttyfd, tty_mode) != 0) { - /* XXX if devnam is a symlink, this will change the link */ - chmod(devnam, tty_mode); - } + if (fchmod(real_ttyfd, tty_mode) != 0) + error("Couldn't restore tty permissions"); } +#endif /* __linux__ */ close(real_ttyfd); real_ttyfd = -1; @@ -827,28 +915,27 @@ start_charshunt(ifd, ofd) { int cpid; - cpid = fork(); + cpid = safe_fork(ifd, ofd, (log_to_fd >= 0? log_to_fd: 2)); if (cpid == -1) { error("Can't fork process for character shunt: %m"); return 0; } if (cpid == 0) { /* child */ - close(pty_slave); + reopen_log(); + if (!nodetach) + log_to_fd = -1; + else if (log_to_fd >= 0) + log_to_fd = 2; + setgid(getgid()); setuid(uid); if (getuid() != uid) fatal("setuid failed"); - setgid(getgid()); - if (!nodetach) - log_to_fd = -1; - charshunt(ifd, ofd, record_file); + charshunt(0, 1, record_file); exit(0); } charshunt_pid = cpid; add_notifier(&sigreceived, stop_charshunt, 0); - close(pty_master); - pty_master = -1; - ttyfd = pty_slave; record_child(cpid, "pppd (charshunt)", charshunt_done, NULL); return 1; } @@ -936,6 +1023,13 @@ charshunt(ifd, ofd, record_file) signal(SIGXFSZ, SIG_DFL); #endif + /* + * Check that the fds won't overrun the fd_sets + */ + if (ifd >= FD_SETSIZE || ofd >= FD_SETSIZE || pty_master >= FD_SETSIZE) + fatal("internal error: file descriptor too large (%d, %d, %d)", + ifd, ofd, pty_master); + /* * Open the record file if required. */ @@ -1038,9 +1132,6 @@ charshunt(ifd, ofd, record_file) } else if (nibuf == 0) { /* end of file from stdin */ stdin_readable = 0; - /* do a 0-length write, hopefully this will generate - an EOF (hangup) on the slave side. */ - write(pty_master, inpacket_buf, 0); if (recordf) if (!record_write(recordf, 4, NULL, 0, &lasttime)) recordf = NULL; @@ -1077,7 +1168,8 @@ charshunt(ifd, ofd, record_file) if (!record_write(recordf, 1, obufp, nobuf, &lasttime)) recordf = NULL; } - } + } else if (!stdin_readable) + pty_readable = 0; if (FD_ISSET(ofd, &writey)) { n = nobuf; if (olevel + n > max_level)