Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbaa7f63

Browse files
committed
pgbench: avoid FD_ISSET on an invalid file descriptor
The original code wasn't careful to test the file descriptor returned byPQsocket() for an invalid socket. If an invalid socket did turn up,that would amount to calling FD_ISSET with fd = -1, whereby undefinedbehavior can be invoked.To fix, test file descriptor for validity and stop further processing ifthat fails.Problem noticed by Coverity.There is an existing FD_ISSET callsite that does check for invalidsockets beforehand, but the error message reported by it wasstrerror(errno); in testing the aforementioned change, that turns out toresult in "bad socket: Success" which isn't terribly helpful. Insteaduse PQerrorMessage() in both places which is more likely to contain anuseful error message.Backpatch-through: 9.1.
1 parente1df791 commitbaa7f63

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

‎contrib/pgbench/pgbench.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2845,7 +2845,7 @@ threadRun(void *arg)
28452845
sock=PQsocket(st->con);
28462846
if (sock<0)
28472847
{
2848-
fprintf(stderr,"bad socket: %s\n",strerror(errno));
2848+
fprintf(stderr,"bad socket: %s",PQerrorMessage(st->con));
28492849
gotodone;
28502850
}
28512851

@@ -2886,11 +2886,21 @@ threadRun(void *arg)
28862886
Command**commands=sql_files[st->use_file];
28872887
intprev_ecnt=st->ecnt;
28882888

2889-
if (st->con&& (FD_ISSET(PQsocket(st->con),&input_mask)
2890-
||commands[st->state]->type==META_COMMAND))
2889+
if (st->con)
28912890
{
2892-
if (!doCustom(thread,st,&result->conn_time,logfile,&aggs))
2893-
remains--;/* I've aborted */
2891+
intsock=PQsocket(st->con);
2892+
2893+
if (sock<0)
2894+
{
2895+
fprintf(stderr,"bad socket: %s",PQerrorMessage(st->con));
2896+
gotodone;
2897+
}
2898+
if (FD_ISSET(sock,&input_mask)||
2899+
commands[st->state]->type==META_COMMAND)
2900+
{
2901+
if (!doCustom(thread,st,&result->conn_time,logfile,&aggs))
2902+
remains--;/* I've aborted */
2903+
}
28942904
}
28952905

28962906
if (st->ecnt>prev_ecnt&&commands[st->state]->type==META_COMMAND)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp