d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with KAME. Don't write past the end of the fd_set.

Browse Source 
Obtained from:	KAME
This commit is contained in:
Kris Kennaway 2000-10-08 07:52:08 +00:00
parent f08606a0aa
commit 2a1c5efaa8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=66808
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
usr.sbin/traceroute6/traceroute6.c
View File

@ -1,4 +1,4 @@
/* $KAME: traceroute6.c,v 1.29 2000/06/12 16:29:18 itojun Exp $ */
/* $KAME: traceroute6.c,v 1.32 2000/07/07 12:21:34 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -264,6 +264,9 @@ static const char rcsid[] =
#include <netdb.h>
#include <stdio.h>
#include <err.h>
#ifdef HAVE_POLL
#include <poll.h>
#endif
#include <errno.h>
#include <stdlib.h>
#include <string.h>
@ -869,18 +872,36 @@ wait_for_reply(sock, mhdr)
int sock;
struct msghdr *mhdr;
{
fd_set fds;
struct timeval wait;
#ifdef HAVE_POLL
struct pollfd pfd[1];
int cc = 0;
FD_ZERO(&fds);
FD_SET(sock, &fds);
wait.tv_sec = waittime; wait.tv_usec = 0;
pfd[0].fd = sock;
pfd[0].events = POLLIN;
pfd[0].revents = 0;
if (select(sock+1, &fds, (fd_set *)0, (fd_set *)0, &wait) > 0)
if (poll(pfd, 1, waittime * 1000) > 0)
cc = recvmsg(rcvsock, mhdr, 0);
return(cc);
#else
fd_set *fdsp;
struct timeval wait;
int cc = 0, fdsn;
fdsn = howmany(sock+1, NFDBITS) * sizeof(fd_mask);
if ((fdsp = (fd_set *)malloc(fdsn)) == NULL)
err(1, "malloc");
memset(fdsp, 0, fdsn);
FD_SET(sock, fdsp);
wait.tv_sec = waittime; wait.tv_usec = 0;
if (select(sock+1, fdsp, (fd_set *)0, (fd_set *)0, &wait) > 0)
cc = recvmsg(rcvsock, mhdr, 0);
free(fdsp);
return(cc);
#endif
}
#ifdef IPSEC