pgsql: pgbench: avoid FD_ISSET on an invalid file descriptor - Mailing list pgsql-committers

From Alvaro Herrera
Subject pgsql: pgbench: avoid FD_ISSET on an invalid file descriptor
Date
Msg-id E1aVShi-0006RL-Ax@gemulon.postgresql.org
Whole thread Raw
List pgsql-committers
pgbench: avoid FD_ISSET on an invalid file descriptor

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.

Branch
------
REL9_4_STABLE

Details
-------
http://git.postgresql.org/pg/commitdiff/ccbb01ff4a4cac8622930ef6475ed3cf8281e4c7

Modified Files
--------------
contrib/pgbench/pgbench.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)


pgsql-committers by date:

Previous
From: Alvaro Herrera
Date:
Subject: pgsql: pgbench: avoid FD_ISSET on an invalid file descriptor
Next
From: Alvaro Herrera
Date:
Subject: pgsql: pgbench: avoid FD_ISSET on an invalid file descriptor