svn commit: trunk/busybox/networking
vda at busybox.net
vda at busybox.net
Sun Oct 15 18:22:05 UTC 2006
Author: vda
Date: 2006-10-15 11:22:05 -0700 (Sun, 15 Oct 2006)
New Revision: 16391
Log:
telnetd: check ptsname() for NULL
Modified:
trunk/busybox/networking/telnetd.c
Changeset:
Modified: trunk/busybox/networking/telnetd.c
===================================================================
--- trunk/busybox/networking/telnetd.c 2006-10-15 17:05:55 UTC (rev 16390)
+++ trunk/busybox/networking/telnetd.c 2006-10-15 18:22:05 UTC (rev 16391)
@@ -188,12 +188,18 @@
{
int p;
#ifdef CONFIG_FEATURE_DEVPTS
- p = open("/dev/ptmx", 2);
+ p = open("/dev/ptmx", O_RDWR);
if (p > 0) {
+ const char *name;
grantpt(p);
unlockpt(p);
- strcpy(line, ptsname(p));
- return(p);
+ name = ptsname(p);
+ if (!name) {
+ bb_perror_msg("ptsname error (is /dev/pts mounted?)");
+ return -1;
+ }
+ strcpy(line, name);
+ return p;
}
#else
struct stat stb;
@@ -213,7 +219,8 @@
#ifdef DEBUG
fprintf(stderr, "Trying to open device: %s\n", line);
#endif
- if ((p = open(line, O_RDWR | O_NOCTTY)) >= 0) {
+ p = open(line, O_RDWR | O_NOCTTY);
+ if (p >= 0) {
line[5] = 't';
return p;
}
@@ -387,7 +394,7 @@
openlog(applet_name, 0, LOG_USER);
logmode = LOGMODE_SYSLOG;
- opt = getopt32(argc, argv, "f:l:" USE_FEATURE_TELNETD_INETD("p:b:"),
+ opt = getopt32(argc, argv, "f:l:" SKIP_FEATURE_TELNETD_INETD("p:b:"),
&issuefile, &loginpath
SKIP_FEATURE_TELNETD_INETD(, &opt_portnbr, &opt_bindaddr));
//if (opt & 1) // -f
@@ -435,7 +442,7 @@
maxfd = master_fd;
#endif /* CONFIG_FEATURE_TELNETD_INETD */
- do {
+ while(1) {
struct tsession *ts;
FD_ZERO(&rdfdset);
@@ -493,8 +500,8 @@
socklen_t salen;
salen = sizeof(sa);
- if ((fd = accept(master_fd, (struct sockaddr *)&sa,
- &salen)) < 0) {
+ fd = accept(master_fd, (struct sockaddr *)&sa, &salen);
+ if (fd < 0) {
continue;
} else {
/* Create a new session and link it into
@@ -632,7 +639,7 @@
}
#endif /* CONFIG_FEATURE_TELNETD_INETD */
- } while (1);
+ } /* while(1) */
return 0;
}
More information about the busybox-cvs
mailing list