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

Commit57ec87c

Browse files
committed
Be more careful to not lose sync in the FE/BE protocol.
If any error occurred while we were in the middle of reading a protocolmessage from the client, we could lose sync, and incorrectly try tointerpret a part of another message as a new protocol message. That willusually lead to an "invalid frontend message" error that terminates theconnection. However, this is a security issue because an attacker mightbe able to deliberately cause an error, inject a Query message in what'ssupposed to be just user data, and have the server execute it.We were quite careful to not have CHECK_FOR_INTERRUPTS() calls or otheroperations that could ereport(ERROR) in the middle of processing a message,but a query cancel interrupt or statement timeout could nevertheless causeit to happen. Also, the V2 fastpath and COPY handling were not so careful.It's very difficult to recover in the V2 COPY protocol, so we will justterminate the connection on error. In practice, that's what happenedpreviously anyway, as we lost protocol sync.To fix, add a new variable in pqcomm.c, PqCommReadingMsg, that is setwhenever we're in the middle of reading a message. When it's set, we cannotsafely ERROR out and continue running, because we might've read only partof a message. PqCommReadingMsg acts somewhat similarly to critical sectionsin that if an error occurs while it's set, the error handler will force theconnection to be terminated, as if the error was FATAL. It's notimplemented by promoting ERROR to FATAL in elog.c, like ERROR is promotedto PANIC in critical sections, because we want to be able to usePG_TRY/CATCH to recover and regain protocol sync. pq_getmessage() takesadvantage of that to prevent an OOM error from terminating the connection.To prevent unnecessary connection terminations, add a holdoff mechanismsimilar to HOLD/RESUME_INTERRUPTS() that can be used hold off query cancelinterrupts, but still allow die interrupts. The rules on which interruptsare processed when are now a bit more complicated, so refactorProcessInterrupts() and the calls to it in signal handlers so that thesignal handlers always call it if ImmediateInterruptOK is set, andProcessInterrupts() can decide to not do anything if the other conditionsare not met.Reported by Emil Lenngren. Patch reviewed by Noah Misch and Andres Freund.Backpatch to all supported versions.Security:CVE-2015-0244
1 parentca84dfa commit57ec87c

File tree

13 files changed

+244
-107
lines changed

13 files changed

+244
-107
lines changed

‎src/backend/commands/copy.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,8 @@ ReceiveCopyBegin(CopyState cstate)
406406
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
407407
errmsg("COPY BINARY is not supported to stdout or from stdin")));
408408
pq_putemptymessage('G');
409+
/* any error in old protocol will make us lose sync */
410+
pq_startmsgread();
409411
cstate->copy_dest=COPY_OLD_FE;
410412
}
411413
else
@@ -416,6 +418,8 @@ ReceiveCopyBegin(CopyState cstate)
416418
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
417419
errmsg("COPY BINARY is not supported to stdout or from stdin")));
418420
pq_putemptymessage('D');
421+
/* any error in old protocol will make us lose sync */
422+
pq_startmsgread();
419423
cstate->copy_dest=COPY_OLD_FE;
420424
}
421425
/* We *must* flush here to ensure FE knows it can send. */
@@ -602,6 +606,8 @@ CopyGetData(CopyState cstate, void *databuf, int minread, int maxread)
602606
intmtype;
603607

604608
readmessage:
609+
HOLD_CANCEL_INTERRUPTS();
610+
pq_startmsgread();
605611
mtype=pq_getbyte();
606612
if (mtype==EOF)
607613
ereport(ERROR,
@@ -611,6 +617,7 @@ CopyGetData(CopyState cstate, void *databuf, int minread, int maxread)
611617
ereport(ERROR,
612618
(errcode(ERRCODE_CONNECTION_FAILURE),
613619
errmsg("unexpected EOF on client connection with an open transaction")));
620+
RESUME_CANCEL_INTERRUPTS();
614621
switch (mtype)
615622
{
616623
case'd':/* CopyData */
@@ -2370,6 +2377,13 @@ CopyFrom(CopyState cstate)
23702377

23712378
MemoryContextSwitchTo(oldcontext);
23722379

2380+
/*
2381+
* In the old protocol, tell pqcomm that we can process normal protocol
2382+
* messages again.
2383+
*/
2384+
if (cstate->copy_dest==COPY_OLD_FE)
2385+
pq_endmsgread();
2386+
23732387
/* Execute AFTER STATEMENT insertion triggers */
23742388
ExecASInsertTriggers(estate,resultRelInfo);
23752389

‎src/backend/libpq/auth.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ recv_password_packet(Port *port)
625625
{
626626
StringInfoDatabuf;
627627

628+
pq_startmsgread();
628629
if (PG_PROTOCOL_MAJOR(port->proto) >=3)
629630
{
630631
/* Expect 'p' message type */
@@ -849,6 +850,7 @@ pg_GSS_recvauth(Port *port)
849850
*/
850851
do
851852
{
853+
pq_startmsgread();
852854
mtype=pq_getbyte();
853855
if (mtype!='p')
854856
{
@@ -1083,6 +1085,7 @@ pg_SSPI_recvauth(Port *port)
10831085
*/
10841086
do
10851087
{
1088+
pq_startmsgread();
10861089
mtype=pq_getbyte();
10871090
if (mtype!='p')
10881091
{

‎src/backend/libpq/pqcomm.c

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,9 @@ static intPqRecvLength;/* End of data available in PqRecvBuffer */
129129
/*
130130
* Message status
131131
*/
132-
staticboolPqCommBusy;
133-
staticboolDoingCopyOut;
132+
staticboolPqCommBusy;/* busy sending data to the client */
133+
staticboolPqCommReadingMsg;/* in the middle of reading a message */
134+
staticboolDoingCopyOut;/* in old-protocol COPY OUT processing */
134135

135136

136137
/* Internal functions */
@@ -156,6 +157,7 @@ pq_init(void)
156157
PqSendBuffer=MemoryContextAlloc(TopMemoryContext,PqSendBufferSize);
157158
PqSendPointer=PqSendStart=PqRecvPointer=PqRecvLength=0;
158159
PqCommBusy= false;
160+
PqCommReadingMsg= false;
159161
DoingCopyOut= false;
160162
on_proc_exit(pq_close,0);
161163
}
@@ -890,6 +892,8 @@ pq_recvbuf(void)
890892
int
891893
pq_getbyte(void)
892894
{
895+
Assert(PqCommReadingMsg);
896+
893897
while (PqRecvPointer >=PqRecvLength)
894898
{
895899
if (pq_recvbuf())/* If nothing in buffer, then recv some */
@@ -928,6 +932,8 @@ pq_getbyte_if_available(unsigned char *c)
928932
{
929933
intr;
930934

935+
Assert(PqCommReadingMsg);
936+
931937
if (PqRecvPointer<PqRecvLength)
932938
{
933939
*c=PqRecvBuffer[PqRecvPointer++];
@@ -980,6 +986,8 @@ pq_getbytes(char *s, size_t len)
980986
{
981987
size_tamount;
982988

989+
Assert(PqCommReadingMsg);
990+
983991
while (len>0)
984992
{
985993
while (PqRecvPointer >=PqRecvLength)
@@ -1012,6 +1020,8 @@ pq_discardbytes(size_t len)
10121020
{
10131021
size_tamount;
10141022

1023+
Assert(PqCommReadingMsg);
1024+
10151025
while (len>0)
10161026
{
10171027
while (PqRecvPointer >=PqRecvLength)
@@ -1048,6 +1058,8 @@ pq_getstring(StringInfo s)
10481058
{
10491059
inti;
10501060

1061+
Assert(PqCommReadingMsg);
1062+
10511063
resetStringInfo(s);
10521064

10531065
/* Read until we get the terminating '\0' */
@@ -1079,6 +1091,58 @@ pq_getstring(StringInfo s)
10791091
}
10801092

10811093

1094+
/* --------------------------------
1095+
*pq_startmsgread- begin reading a message from the client.
1096+
*
1097+
*This must be called before any of the pq_get* functions.
1098+
* --------------------------------
1099+
*/
1100+
void
1101+
pq_startmsgread(void)
1102+
{
1103+
/*
1104+
* There shouldn't be a read active already, but let's check just to be
1105+
* sure.
1106+
*/
1107+
if (PqCommReadingMsg)
1108+
ereport(FATAL,
1109+
(errcode(ERRCODE_PROTOCOL_VIOLATION),
1110+
errmsg("terminating connection because protocol sync was lost")));
1111+
1112+
PqCommReadingMsg= true;
1113+
}
1114+
1115+
1116+
/* --------------------------------
1117+
*pq_endmsgread- finish reading message.
1118+
*
1119+
*This must be called after reading a V2 protocol message with
1120+
*pq_getstring() and friends, to indicate that we have read the whole
1121+
*message. In V3 protocol, pq_getmessage() does this implicitly.
1122+
* --------------------------------
1123+
*/
1124+
void
1125+
pq_endmsgread(void)
1126+
{
1127+
Assert(PqCommReadingMsg);
1128+
1129+
PqCommReadingMsg= false;
1130+
}
1131+
1132+
/* --------------------------------
1133+
*pq_is_reading_msg - are we currently reading a message?
1134+
*
1135+
* This is used in error recovery at the outer idle loop to detect if we have
1136+
* lost protocol sync, and need to terminate the connection. pq_startmsgread()
1137+
* will check for that too, but it's nicer to detect it earlier.
1138+
* --------------------------------
1139+
*/
1140+
bool
1141+
pq_is_reading_msg(void)
1142+
{
1143+
returnPqCommReadingMsg;
1144+
}
1145+
10821146
/* --------------------------------
10831147
*pq_getmessage- get a message with length word from connection
10841148
*
@@ -1100,6 +1164,8 @@ pq_getmessage(StringInfo s, int maxlen)
11001164
{
11011165
int32len;
11021166

1167+
Assert(PqCommReadingMsg);
1168+
11031169
resetStringInfo(s);
11041170

11051171
/* Read message length word */
@@ -1141,6 +1207,9 @@ pq_getmessage(StringInfo s, int maxlen)
11411207
ereport(COMMERROR,
11421208
(errcode(ERRCODE_PROTOCOL_VIOLATION),
11431209
errmsg("incomplete message from client")));
1210+
1211+
/* we discarded the rest of the message so we're back in sync. */
1212+
PqCommReadingMsg= false;
11441213
PG_RE_THROW();
11451214
}
11461215
PG_END_TRY();
@@ -1158,6 +1227,9 @@ pq_getmessage(StringInfo s, int maxlen)
11581227
s->data[len]='\0';
11591228
}
11601229

1230+
/* finished reading the message. */
1231+
PqCommReadingMsg= false;
1232+
11611233
return0;
11621234
}
11631235

‎src/backend/postmaster/postmaster.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,6 +1764,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
17641764
ProtocolVersionproto;
17651765
MemoryContextoldcontext;
17661766

1767+
pq_startmsgread();
17671768
if (pq_getbytes((char*)&len,4)==EOF)
17681769
{
17691770
/*
@@ -1808,6 +1809,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
18081809
errmsg("incomplete startup packet")));
18091810
returnSTATUS_ERROR;
18101811
}
1812+
pq_endmsgread();
18111813

18121814
/*
18131815
* The first field is either a protocol version number or a special

‎src/backend/replication/walsender.c

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,6 +1352,7 @@ ProcessRepliesIfAny(void)
13521352

13531353
for (;;)
13541354
{
1355+
pq_startmsgread();
13551356
r=pq_getbyte_if_available(&firstchar);
13561357
if (r<0)
13571358
{
@@ -1364,9 +1365,20 @@ ProcessRepliesIfAny(void)
13641365
if (r==0)
13651366
{
13661367
/* no data available without blocking */
1368+
pq_endmsgread();
13671369
break;
13681370
}
13691371

1372+
/* Read the message contents */
1373+
resetStringInfo(&reply_message);
1374+
if (pq_getmessage(&reply_message,0))
1375+
{
1376+
ereport(COMMERROR,
1377+
(errcode(ERRCODE_PROTOCOL_VIOLATION),
1378+
errmsg("unexpected EOF on standby connection")));
1379+
proc_exit(0);
1380+
}
1381+
13701382
/*
13711383
* If we already received a CopyDone from the frontend, the frontend
13721384
* should not send us anything until we've closed our end of the COPY.
@@ -1402,16 +1414,6 @@ ProcessRepliesIfAny(void)
14021414
streamingDoneSending= true;
14031415
}
14041416

1405-
/* consume the CopyData message */
1406-
resetStringInfo(&reply_message);
1407-
if (pq_getmessage(&reply_message,0))
1408-
{
1409-
ereport(COMMERROR,
1410-
(errcode(ERRCODE_PROTOCOL_VIOLATION),
1411-
errmsg("unexpected EOF on standby connection")));
1412-
proc_exit(0);
1413-
}
1414-
14151417
streamingDoneReceiving= true;
14161418
received= true;
14171419
break;
@@ -1448,19 +1450,6 @@ ProcessStandbyMessage(void)
14481450
{
14491451
charmsgtype;
14501452

1451-
resetStringInfo(&reply_message);
1452-
1453-
/*
1454-
* Read the message contents.
1455-
*/
1456-
if (pq_getmessage(&reply_message,0))
1457-
{
1458-
ereport(COMMERROR,
1459-
(errcode(ERRCODE_PROTOCOL_VIOLATION),
1460-
errmsg("unexpected EOF on standby connection")));
1461-
proc_exit(0);
1462-
}
1463-
14641453
/*
14651454
* Check message type from the first byte.
14661455
*/

‎src/backend/storage/lmgr/proc.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -668,11 +668,16 @@ LockErrorCleanup(void)
668668
LWLock*partitionLock;
669669
DisableTimeoutParamstimeouts[2];
670670

671+
HOLD_INTERRUPTS();
672+
671673
AbortStrongLockAcquire();
672674

673675
/* Nothing to do if we weren't waiting for a lock */
674676
if (lockAwaited==NULL)
677+
{
678+
RESUME_INTERRUPTS();
675679
return;
680+
}
676681

677682
/*
678683
* Turn off the deadlock and lock timeout timers, if they are still
@@ -722,6 +727,8 @@ LockErrorCleanup(void)
722727
* wakeup signal isn't harmful, and it seems not worth expending cycles to
723728
* get rid of a signal that most likely isn't there.
724729
*/
730+
731+
RESUME_INTERRUPTS();
725732
}
726733

727734

‎src/backend/tcop/fastpath.c

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static int16 parse_fcall_arguments_20(StringInfo msgBuf, struct fp_info * fip,
7575
* The caller should already have initialized buf to empty.
7676
* ----------------
7777
*/
78-
staticint
78+
int
7979
GetOldFunctionMessage(StringInfobuf)
8080
{
8181
int32ibuf;
@@ -280,33 +280,6 @@ HandleFunctionRequest(StringInfo msgBuf)
280280
boolwas_logged= false;
281281
charmsec_str[32];
282282

283-
/*
284-
* Read message contents if not already done.
285-
*/
286-
if (PG_PROTOCOL_MAJOR(FrontendProtocol)<3)
287-
{
288-
if (GetOldFunctionMessage(msgBuf))
289-
{
290-
if (IsTransactionState())
291-
ereport(COMMERROR,
292-
(errcode(ERRCODE_CONNECTION_FAILURE),
293-
errmsg("unexpected EOF on client connection with an open transaction")));
294-
else
295-
{
296-
/*
297-
* Can't send DEBUG log messages to client at this point.
298-
* Since we're disconnecting right away, we don't need to
299-
* restore whereToSendOutput.
300-
*/
301-
whereToSendOutput=DestNone;
302-
ereport(DEBUG1,
303-
(errcode(ERRCODE_CONNECTION_DOES_NOT_EXIST),
304-
errmsg("unexpected EOF on client connection")));
305-
}
306-
returnEOF;
307-
}
308-
}
309-
310283
/*
311284
* Now that we've eaten the input message, check to see if we actually
312285
* want to do the function call or not. It's now safe to ereport(); we

0 commit comments

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