Skip to content

Commit 8b5e2cd

Browse files
alubennikovaalubennikova
committed
Fix CVE-2018-1058. Use schema name explicitly in all function calls.
1 parent f8f9e47 commit 8b5e2cd

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎src/backup.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ confirm_block_size(const char *name, int blcksz)
940940
char *endp;
941941
int block_size;
942942

943-
res = pgut_execute(backup_conn, "SELECT current_setting($1)", 1, &name, true);
943+
res = pgut_execute(backup_conn, "SELECT pg_catalog.current_setting($1)", 1, &name, true);
944944
if (PQntuples(res) != 1 || PQnfields(res) != 1)
945945
elog(ERROR, "cannot get %s: %s", name, PQerrorMessage(backup_conn));
946946

@@ -974,13 +974,13 @@ pg_start_backup(const char *label, bool smooth, pgBackup *backup)
974974
params[1] = smooth ? "false" : "true";
975975
if (!exclusive_backup)
976976
res = pgut_execute(conn,
977-
"SELECT pg_start_backup($1, $2, false)",
977+
"SELECT pg_catalog.pg_start_backup($1, $2, false)",
978978
2,
979979
params,
980980
true);
981981
else
982982
res = pgut_execute(conn,
983-
"SELECT pg_start_backup($1, $2)",
983+
"SELECT pg_catalog.pg_start_backup($1, $2)",
984984
2,
985985
params,
986986
true);
@@ -1038,9 +1038,9 @@ pg_switch_wal(PGconn *conn)
10381038
PQclear(res);
10391039

10401040
if (server_version >= 100000)
1041-
res = pgut_execute(conn, "SELECT * FROM pg_switch_wal()", 0, NULL, true);
1041+
res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_wal()", 0, NULL, true);
10421042
else
1043-
res = pgut_execute(conn, "SELECT * FROM pg_switch_xlog()", 0, NULL, true);
1043+
res = pgut_execute(conn, "SELECT * FROM pg_catalog.pg_switch_xlog()", 0, NULL, true);
10441044

10451045
PQclear(res);
10461046
}
@@ -1065,7 +1065,7 @@ pg_ptrack_support(void)
10651065
PQclear(res_db);
10661066

10671067
res_db = pgut_execute(backup_conn,
1068-
"SELECT ptrack_version()",
1068+
"SELECT pg_catalog.ptrack_version()",
10691069
0, NULL, true);
10701070
if (PQntuples(res_db) == 0)
10711071
{
@@ -1125,7 +1125,7 @@ pg_is_in_recovery(void)
11251125
{
11261126
PGresult *res_db;
11271127

1128-
res_db = pgut_execute(backup_conn, "SELECT pg_is_in_recovery()", 0, NULL, true);
1128+
res_db = pgut_execute(backup_conn, "SELECT pg_catalog.pg_is_in_recovery()", 0, NULL, true);
11291129

11301130
if (PQgetvalue(res_db, 0, 0)[0] == 't')
11311131
{
@@ -1164,11 +1164,11 @@ pg_ptrack_clear(void)
11641164
tblspcOid = atoi(PQgetvalue(res_db, i, 2));
11651165

11661166
tmp_conn = pgut_connect(dbname);
1167-
res = pgut_execute(tmp_conn, "SELECT pg_ptrack_clear()", 0, NULL, true);
1167+
res = pgut_execute(tmp_conn, "SELECT pg_catalog.pg_ptrack_clear()", 0, NULL, true);
11681168

11691169
sprintf(params[0], "%i", dbOid);
11701170
sprintf(params[1], "%i", tblspcOid);
1171-
res = pgut_execute(tmp_conn, "SELECT pg_ptrack_get_and_clear_db($1, $2)",
1171+
res = pgut_execute(tmp_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear_db($1, $2)",
11721172
2, (const char **)params, true);
11731173
PQclear(res);
11741174

@@ -1215,7 +1215,7 @@ pg_ptrack_get_and_clear_db(Oid dbOid, Oid tblspcOid)
12151215

12161216
sprintf(params[0], "%i", dbOid);
12171217
sprintf(params[1], "%i", tblspcOid);
1218-
res = pgut_execute(backup_conn, "SELECT pg_ptrack_get_and_clear_db($1, $2)",
1218+
res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear_db($1, $2)",
12191219
2, (const char **)params, true);
12201220

12211221
if (PQnfields(res) != 1)
@@ -1276,7 +1276,7 @@ pg_ptrack_get_and_clear(Oid tablespace_oid, Oid db_oid, Oid rel_filenode,
12761276
tmp_conn = pgut_connect(dbname);
12771277
sprintf(params[0], "%i", tablespace_oid);
12781278
sprintf(params[1], "%i", rel_filenode);
1279-
res = pgut_execute(tmp_conn, "SELECT pg_ptrack_get_and_clear($1, $2)",
1279+
res = pgut_execute(tmp_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear($1, $2)",
12801280
2, (const char **)params, true);
12811281

12821282
if (PQnfields(res) != 1)
@@ -1294,7 +1294,7 @@ pg_ptrack_get_and_clear(Oid tablespace_oid, Oid db_oid, Oid rel_filenode,
12941294
*/
12951295
sprintf(params[0], "%i", tablespace_oid);
12961296
sprintf(params[1], "%i", rel_filenode);
1297-
res = pgut_execute(backup_conn, "SELECT pg_ptrack_get_and_clear($1, $2)",
1297+
res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_ptrack_get_and_clear($1, $2)",
12981298
2, (const char **)params, true);
12991299

13001300
if (PQnfields(res) != 1)
@@ -1475,10 +1475,10 @@ wait_replica_wal_lsn(XLogRecPtr lsn, bool is_start_backup)
14751475
if (is_start_backup)
14761476
{
14771477
if (server_version >= 100000)
1478-
res = pgut_execute(backup_conn, "SELECT pg_last_wal_replay_lsn()",
1478+
res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_wal_replay_lsn()",
14791479
0, NULL, true);
14801480
else
1481-
res = pgut_execute(backup_conn, "SELECT pg_last_xlog_replay_location()",
1481+
res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_xlog_replay_location()",
14821482
0, NULL, true);
14831483
}
14841484
/*
@@ -1488,10 +1488,10 @@ wait_replica_wal_lsn(XLogRecPtr lsn, bool is_start_backup)
14881488
else
14891489
{
14901490
if (server_version >= 100000)
1491-
res = pgut_execute(backup_conn, "SELECT pg_last_wal_receive_lsn()",
1491+
res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_wal_receive_lsn()",
14921492
0, NULL, true);
14931493
else
1494-
res = pgut_execute(backup_conn, "SELECT pg_last_xlog_receive_location()",
1494+
res = pgut_execute(backup_conn, "SELECT pg_catalog.pg_last_xlog_receive_location()",
14951495
0, NULL, true);
14961496
}
14971497

@@ -1575,7 +1575,7 @@ pg_stop_backup(pgBackup *backup)
15751575
base36enc(backup->start_time));
15761576
params[0] = name;
15771577

1578-
res = pgut_execute(conn, "SELECT pg_create_restore_point($1)",
1578+
res = pgut_execute(conn, "SELECT pg_catalog.pg_create_restore_point($1)",
15791579
1, params, true);
15801580
PQclear(res);
15811581
}
@@ -1600,22 +1600,22 @@ pg_stop_backup(pgBackup *backup)
16001600
*/
16011601
sent = pgut_send(conn,
16021602
"SELECT"
1603-
" txid_snapshot_xmax(txid_current_snapshot()),"
1603+
" pg_catalog.txid_snapshot_xmax(pg_catalog.txid_current_snapshot()),"
16041604
" current_timestamp(0)::timestamptz,"
16051605
" lsn,"
16061606
" labelfile,"
16071607
" spcmapfile"
1608-
" FROM pg_stop_backup(false)",
1608+
" FROM pg_catalog.pg_stop_backup(false)",
16091609
0, NULL, WARNING);
16101610
}
16111611
else
16121612
{
16131613

16141614
sent = pgut_send(conn,
16151615
"SELECT"
1616-
" txid_snapshot_xmax(txid_current_snapshot()),"
1616+
" pg_catalog.txid_snapshot_xmax(pg_catalog.txid_current_snapshot()),"
16171617
" current_timestamp(0)::timestamptz,"
1618-
" pg_stop_backup() as lsn",
1618+
" pg_catalog.pg_stop_backup() as lsn",
16191619
0, NULL, WARNING);
16201620
}
16211621
pg_stop_backup_is_sent = true;
@@ -2679,7 +2679,7 @@ get_last_ptrack_lsn(void)
26792679
uint32 xrecoff;
26802680
XLogRecPtr lsn;
26812681

2682-
res = pgut_execute(backup_conn, "select pg_ptrack_control_lsn()", 0, NULL, true);
2682+
res = pgut_execute(backup_conn, "select pg_catalog.pg_ptrack_control_lsn()", 0, NULL, true);
26832683

26842684
/* Extract timeline and LSN from results of pg_start_backup() */
26852685
XLogDataFromLSN(PQgetvalue(res, 0, 0), &xlogid, &xrecoff);
@@ -2727,7 +2727,7 @@ pg_ptrack_get_block(backup_files_args *arguments,
27272727
//elog(LOG, "db %i pg_ptrack_get_block(%i, %i, %u)",dbOid, tblsOid, relOid, blknum);
27282728
res = pgut_execute_parallel(arguments->thread_backup_conn,
27292729
arguments->thread_cancel_conn,
2730-
"SELECT pg_ptrack_get_block_2($1, $2, $3, $4)",
2730+
"SELECT pg_catalog.pg_ptrack_get_block_2($1, $2, $3, $4)",
27312731
4, (const char **)params, true);
27322732

27332733
if (PQnfields(res) != 1)

‎src/fetch.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fetchFile(PGconn *conn, const char *filename, size_t *filesize)
9595
int len;
9696

9797
params[0] = filename;
98-
res = pgut_execute(conn, "SELECT pg_read_binary_file($1)",
98+
res = pgut_execute(conn, "SELECT pg_catalog.pg_read_binary_file($1)",
9999
1, params, false);
100100

101101
/* sanity check the result set */

‎src/util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ get_remote_system_identifier(PGconn *conn)
148148
char *val;
149149

150150
res = pgut_execute(conn,
151-
"SELECT system_identifier FROM pg_control_system()",
151+
"SELECT system_identifier FROM pg_catalog.pg_control_system()",
152152
0, NULL, true);
153153
val = PQgetvalue(res, 0, 0);
154154
if (!parse_uint64(val, &system_id_conn, 0))

0 commit comments

Comments
 (0)