emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fakeidentd: fix use-after-free

Browse Source 
function                                             old     new   delta
do_rd                                                199     197      -2

Signed-off-by: Ryan Mallon <rmallon@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Ryan Mallon 2014-01-09 19:14:07 +01:00 committed by Denys Vlasenko
parent 16ca379b55
commit 89deb22f97
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
networking/isrv_identd.c
View File

@ -51,19 +51,18 @@ static int do_rd(int fd, void **paramp)
{ {
identd_buf_t *buf = *paramp; identd_buf_t *buf = *paramp;
char *cur, *p; char *cur, *p;
int retval = 0; /* session is ok (so far) */
int sz; int sz;
cur = buf->buf + buf->pos; cur = buf->buf + buf->pos;
if (buf->fd_flag & O_NONBLOCK) if (buf->fd_flag & O_NONBLOCK)
fcntl(fd, F_SETFL, buf->fd_flag); fcntl(fd, F_SETFL, buf->fd_flag);
sz = safe_read(fd, cur, sizeof(buf->buf) - buf->pos); sz = safe_read(fd, cur, sizeof(buf->buf) - 1 - buf->pos);
if (sz < 0) { if (sz < 0) {
if (errno != EAGAIN) if (errno != EAGAIN)
goto term; /* terminate this session if !EAGAIN */ goto term;
goto ok; return 0; /* "session is ok" */
} }
buf->pos += sz; buf->pos += sz;
@ -71,19 +70,19 @@ static int do_rd(int fd, void **paramp)
p = strpbrk(cur, "\r\n"); p = strpbrk(cur, "\r\n");
if (p) if (p)
*p = '\0'; *p = '\0';
if (!p && sz && buf->pos <= (int)sizeof(buf->buf)) if (!p && sz && buf->pos < (int)sizeof(buf->buf))
goto ok; return 0; /* "session is ok" */
/* Terminate session. If we are in server mode, then /* Terminate session. If we are in server mode, then
* fd is still in nonblocking mode - we never block here */ * fd is still in nonblocking mode - we never block here */
if (fd == 0) fd++; /* inetd mode? then write to fd 1 */ if (fd == 0)
fd++; /* inetd mode? then write to fd 1 */
fdprintf(fd, "%s : USERID : UNIX : %s\r\n", buf->buf, bogouser); fdprintf(fd, "%s : USERID : UNIX : %s\r\n", buf->buf, bogouser);
term:
free(buf);
retval = 1; /* terminate */
ok:
if (buf->fd_flag & O_NONBLOCK) if (buf->fd_flag & O_NONBLOCK)
fcntl(fd, F_SETFL, buf->fd_flag & ~O_NONBLOCK); fcntl(fd, F_SETFL, buf->fd_flag & ~O_NONBLOCK);
return retval; term:
free(buf);
return 1; /* "terminate" */
} }
static int do_timeout(void **paramp UNUSED_PARAM) static int do_timeout(void **paramp UNUSED_PARAM)
@ -120,7 +119,7 @@ int fakeidentd_main(int argc UNUSED_PARAM, char **argv)
opt = getopt32(argv, "fiwb:", &bind_address); opt = getopt32(argv, "fiwb:", &bind_address);
strcpy(bogouser, "nobody"); strcpy(bogouser, "nobody");
if (argv[optind]) if (argv[optind])
strncpy(bogouser, argv[optind], sizeof(bogouser)); strncpy(bogouser, argv[optind], sizeof(bogouser) - 1);
/* Daemonize if no -f and no -i and no -w */ /* Daemonize if no -f and no -i and no -w */
if (!(opt & OPT_fiw)) if (!(opt & OPT_fiw))