rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-04 16:07:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

pgbench: avoid FD_ISSET on an invalid file descriptor

Browse Source 
The original code wasn't careful to test the file descriptor returned by
PQsocket() for an invalid socket.  If an invalid socket did turn up,
that would amount to calling FD_ISSET with fd = -1, whereby undefined
behavior can be invoked.

To fix, test file descriptor for validity and stop further processing if
that fails.

Problem noticed by Coverity.

There is an existing FD_ISSET callsite that does check for invalid
sockets beforehand, but the error message reported by it was
strerror(errno); in testing the aforementioned change, that turns out to
result in "bad socket: Success" which isn't terribly helpful.  Instead
use PQerrorMessage() in both places which is more likely to contain an
useful error message.

Backpatch-through: 9.1.
This commit is contained in:
Alvaro Herrera 2016-02-15 20:33:43 -03:00
parent d2ab9b0ac3
commit 1bad289a80
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/pgbench/pgbench.c
View File

@ -3683,7 +3683,7 @@ threadRun(void *arg)
sock = PQsocket(st->con);
if (sock < 0)
{
fprintf(stderr, "bad socket: %s\n", strerror(errno));
fprintf(stderr, "bad socket: %s", PQerrorMessage(st->con));
goto done;
}
@ -3751,11 +3751,21 @@ threadRun(void *arg)
Command **commands = sql_files[st->use_file];
int prev_ecnt = st->ecnt;
if (st->con && (FD_ISSET(PQsocket(st->con), &input_mask)
|| commands[st->state]->type == META_COMMAND))
if (st->con)
{
if (!doCustom(thread, st, &result->conn_time, logfile, &aggs))
remains--; /* I've aborted */
int sock = PQsocket(st->con);
if (sock < 0)
{
fprintf(stderr, "bad socket: %s", PQerrorMessage(st->con));
goto done;
}
if (FD_ISSET(sock, &input_mask) ||
commands[st->state]->type == META_COMMAND)
{
if (!doCustom(thread, st, &result->conn_time, logfile, &aggs))
remains--; /* I've aborted */
}
}
if (st->ecnt > prev_ecnt && commands[st->state]->type == META_COMMAND)