kris/httperf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Totally untested fix for select() logic going out of bounds.

Browse Source
This commit is contained in:
Adrian Chadd 2016-03-31 10:41:04 -07:00
parent cc888437e4
commit f62f1c0bda
1 changed files with 58 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/core.c
View File

@ -1445,14 +1445,58 @@ core_loop(void)
} }
} }
#else #else
static void
check_conn(int sd, int is_readable, int is_writable)
{
Conn *conn;
Any_Type arg;
Conn *conn;
/* Don't bother doing anything if we're not ready */
if ((is_readable || is_writable) == 0) {
return;
}
/*
* only handle sockets that
* haven't timed out yet
*/
conn = sd_to_conn[sd];
conn_inc_ref(conn);
if (conn->watchdog) {
timer_cancel(conn->watchdog);
conn->watchdog = 0;
}
if (conn->state == S_CONNECTING) {
#ifdef HAVE_SSL
if (param.use_ssl)
core_ssl_connect(conn);
else
#endif
if (is_writable) {
clear_active(conn, WRITE);
conn->state = S_CONNECTED;
arg.l = 0;
event_signal(EV_CONN_CONNECTED, (Object*)conn, arg);
}
} else {
if (is_writable && conn->sendq)
do_send(conn);
if (is_readable && conn->recvq)
do_recv(conn);
}
conn_dec_ref(conn);
}
void void
core_loop(void) core_loop(void)
{ {
int is_readable, is_writable, n, sd, bit, min_i, max_i, i = 0; int is_readable, is_writable, n, sd, i = 0;
fd_set readable, writable; fd_set readable, writable;
fd_mask mask; fd_mask mask;
Any_Type arg;
Conn *conn;
while (running) { while (running) {
struct timeval tv = select_timeout; struct timeval tv = select_timeout;
@ -1476,68 +1520,19 @@ core_loop(void)
continue; continue;
} }
while (n > 0) { /* XXX totally suboptimal loop, but less potentially problematic */
/*
* find the index of the fdmask that has something
* going on:
*/
do {
++i;
if (i > max_i)
i = min_i;
assert(i <= max_i); for (i = 0; i <= max_sd; i++) {
mask = readable.fds_bits[i] | writable.fds_bits[i]; is_readable = (FD_ISSET(sd, &readable) && FD_ISSET(sd, &rdfds));
} while (!mask); is_writable = (FD_ISSET(sd, &writable) && FD_ISSET(sd, &wrfds));
bit = 0; if (is_readable || is_writable)
sd = i * NFDBITS + bit; check_conn(sd, is_readable, is_writable);
do {
if (mask & 1) {
--n;
is_readable = (FD_ISSET(sd, &readable) && FD_ISSET(sd, &rdfds));
is_writable = (FD_ISSET(sd, &writable) && FD_ISSET(sd, &wrfds));
if (is_readable || is_writable) {
/*
* only handle sockets that
* haven't timed out yet
*/
conn = sd_to_conn[sd];
conn_inc_ref(conn);
if (conn->watchdog) { /* XXX TODO: totally can bail out if we've seen 'n' FDs */
timer_cancel(conn->watchdog); }
conn->watchdog = 0;
} /* Do timer tick at the end of the connection check */
if (conn->state == S_CONNECTING) { timer_tick();
#ifdef HAVE_SSL
if (param.use_ssl)
core_ssl_connect(conn);
else
#endif
if (is_writable) {
clear_active(conn, WRITE);
conn->state = S_CONNECTED;
arg.l = 0;
event_signal(EV_CONN_CONNECTED, (Object*)conn, arg);
}
} else {
if (is_writable && conn->sendq)
do_send(conn);
if (is_readable && conn->recvq)
do_recv(conn);
}
conn_dec_ref(conn);
if (n > 0)
timer_tick();
}
}
mask = ((u_long) mask) >> 1;
++sd;
} while (mask);
}
} }
} }
#endif #endif