NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite882bca

committed

libpq: Fix minor TOCTOU violation

libpq checks the permissions of the password file before opening it.The way this is done in two separate operations, a static analyzerwould flag as a time-of-check-time-of-use violation. In practice, youcan't do anything with that, but it still seems better style to fixit.To fix it, open the file first and then check the permissions on theopened file handle.Reviewed-by: Aleksander Alekseev <aleksander@timescale.com>Reviewed-by: Andreas Karlsson <andreas@proxel.se>Discussion:https://www.postgresql.org/message-id/flat/a3356054-14ae-4e7a-acc6-249d19dac20b%40eisentraut.org

1 parente3ec9dc commite882bcaCopy full SHA for e882bca

File tree

1 file changed

-5

lines changed

src/interfaces/libpq
- fe-connect.c

1 file changed

-5

lines changed

`‎src/interfaces/libpq/fe-connect.c`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -7452,7 +7452,9 @@ passwordFromFile(const char hostname, const char port, const char *dbname,`
`7452`	`7452`	`constcharusername,constcharpgpassfile)`
`7453`	`7453`	`{`
`7454`	`7454`	`FILE*fp;`
	`7455`	`+#ifndefWIN32`
`7455`	`7456`	`structstatstat_buf;`
	`7457`	`+#endif`
`7456`	`7458`	`PQExpBufferDatabuf;`
`7457`	`7459`
`7458`	`7460`	`if (dbname==NULL\|\|dbname[0]=='\0')`
`@@ -7477,10 +7479,14 @@ passwordFromFile(const char hostname, const char port, const char *dbname,`
`7477`	`7479`	`port=DEF_PGPORT_STR;`
`7478`	`7480`
`7479`	`7481`	`/* If password file cannot be opened, ignore it. */`
`7480`		`-if (stat(pgpassfile,&stat_buf)!=0)`
	`7482`	`+fp=fopen(pgpassfile,"r");`
	`7483`	`+if (fp==NULL)`
`7481`	`7484`	`returnNULL;`
`7482`	`7485`
`7483`	`7486`	`#ifndefWIN32`
	`7487`	`+if (fstat(fileno(fp),&stat_buf)!=0)`
	`7488`	`+returnNULL;`
	`7489`	`+`
`7484`	`7490`	`if (!S_ISREG(stat_buf.st_mode))`
`7485`	`7491`	`{`
`7486`	`7492`	`fprintf(stderr,`
`@@ -7505,10 +7511,6 @@ passwordFromFile(const char hostname, const char port, const char *dbname,`
`7505`	`7511`	`*/`
`7506`	`7512`	`#endif`
`7507`	`7513`
`7508`		`-fp=fopen(pgpassfile,"r");`
`7509`		`-if (fp==NULL)`
`7510`		`-returnNULL;`
`7511`		`-`
`7512`	`7514`	`/* Use an expansible buffer to accommodate any reasonable line length */`
`7513`	`7515`	`initPQExpBuffer(&buf);`
`7514`	`7516`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite882bca

File tree

1 file changed

1 file changed

`‎src/interfaces/libpq/fe-connect.c`

0 commit comments