fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 22:10:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

record: avoid crash when calling RecordFlushReplyBuffer recursively

Browse source 
RecordFlushReplyBuffer can call itself recursively through
WriteClient->CallCallbacks->_CallCallbacks->RecordFlushAllContexts
when the recording client's buffer cannot be completely emptied in one
WriteClient. When a such a recursion occurs, it will not be broken out
of which results in segmentation fault when the stack is exhausted.

This patch adds a counter (a flag, really) that guards against this
situation, to break out of the recursion.

One alternative to this change would be to change _CallCallbacks to
check the corresponding counter before the callback loop, but that
might affect existing behavior, which may be relied upon.

Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Signed-off-by: Erkki Seppälä <erkki.seppala@vincit.fi>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 0801afbd7c)
This commit is contained in:
Erkki Seppälä 2011-02-10 15:35:14 +02:00 • committed by Jeremy Huddleston
parent f60f586c64
commit 8369467c20
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
record/record.c
View file

@ -77,6 +77,7 @@ typedef struct {
char bufCategory; /* category of protocol in replyBuffer */ char bufCategory; /* category of protocol in replyBuffer */
int numBufBytes; /* number of bytes in replyBuffer */ int numBufBytes; /* number of bytes in replyBuffer */
char replyBuffer[REPLY_BUF_SIZE]; /* buffered recorded protocol */ char replyBuffer[REPLY_BUF_SIZE]; /* buffered recorded protocol */
int inFlush; /* are we inside RecordFlushReplyBuffer */
} RecordContextRec, *RecordContextPtr; } RecordContextRec, *RecordContextPtr;
/* RecordMinorOpRec - to hold minor opcode selections for extension requests /* RecordMinorOpRec - to hold minor opcode selections for extension requests
@ -245,8 +246,9 @@ RecordFlushReplyBuffer(
int len2 int len2
) )
{ {
if (!pContext->pRecordingClient || pContext->pRecordingClient->clientGone) if (!pContext->pRecordingClient || pContext->pRecordingClient->clientGone || pContext->inFlush)
return; return;
++pContext->inFlush;
if (pContext->numBufBytes) if (pContext->numBufBytes)
WriteToClient(pContext->pRecordingClient, pContext->numBufBytes, WriteToClient(pContext->pRecordingClient, pContext->numBufBytes,
(char *)pContext->replyBuffer); (char *)pContext->replyBuffer);
@ -255,6 +257,7 @@ RecordFlushReplyBuffer(
WriteToClient(pContext->pRecordingClient, len1, (char *)data1); WriteToClient(pContext->pRecordingClient, len1, (char *)data1);
if (len2) if (len2)
WriteToClient(pContext->pRecordingClient, len2, (char *)data2); WriteToClient(pContext->pRecordingClient, len2, (char *)data2);
--pContext->inFlush;
} /* RecordFlushReplyBuffer */ } /* RecordFlushReplyBuffer */
@ -1938,6 +1941,7 @@ ProcRecordCreateContext(ClientPtr client)
pContext->numBufBytes = 0; pContext->numBufBytes = 0;
pContext->pBufClient = NULL; pContext->pBufClient = NULL;
pContext->continuedReply = 0; pContext->continuedReply = 0;
pContext->inFlush = 0;
err = RecordRegisterClients(pContext, client, err = RecordRegisterClients(pContext, client,
(xRecordRegisterClientsReq *)stuff); (xRecordRegisterClientsReq *)stuff);