Skip to content

Commit

Permalink
os: Check oc->trans_conn before using oc->fd in YieldControlNoInput
Browse files Browse the repository at this point in the history
oc->trans_conn is set to NULL when the connection is closed. At this
point, oc->fd is no longer valid and shouldn't be used. Move
dereference of oc->fd up into YieldControlNoInput where the state of
oc->trans_conn can be checked in a single place.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

keith-packard authored and nwnk committed Jun 13, 2017
1 parent 448a558 commit d05c754
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions os/io.c
Original file line number Diff line number Diff line change
@@ -183,10 +183,12 @@ YieldControl(void)
}

static void
YieldControlNoInput(int fd)
YieldControlNoInput(ClientPtr client)
{
OsCommPtr oc = client->osPrivate;
YieldControl();
ospoll_reset_events(server_poll, fd);
if (oc->trans_conn)
ospoll_reset_events(server_poll, oc->fd);
}

static void
@@ -226,7 +228,6 @@ ReadRequestFromClient(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
ConnectionInputPtr oci = oc->input;
int fd = oc->fd;
unsigned int gotnow, needed;
int result;
register xReq *request;
@@ -357,7 +358,7 @@ ReadRequestFromClient(ClientPtr client)
if (0)
#endif
{
YieldControlNoInput(fd);
YieldControlNoInput(client);
return 0;
}
}
@@ -394,7 +395,7 @@ ReadRequestFromClient(ClientPtr client)
}
if (gotnow < needed) {
/* Still don't have enough; punt. */
YieldControlNoInput(fd);
YieldControlNoInput(client);
return 0;
}
}
@@ -494,7 +495,6 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
ConnectionInputPtr oci = oc->input;
int fd = oc->fd;
int gotnow, moveup;

NextAvailableInput(oc);
@@ -533,7 +533,7 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
(gotnow >= (int) (get_req_len((xReq *) oci->bufptr, client) << 2)))
mark_client_ready(client);
else
YieldControlNoInput(fd);
YieldControlNoInput(client);
return TRUE;
}

@@ -548,7 +548,6 @@ ResetCurrentRequest(ClientPtr client)
{
OsCommPtr oc = (OsCommPtr) client->osPrivate;
register ConnectionInputPtr oci = oc->input;
int fd = oc->fd;
register xReq *request;
int gotnow, needed;

@@ -557,7 +556,7 @@ ResetCurrentRequest(ClientPtr client)
oci->lenLastReq = 0;
gotnow = oci->bufcnt + oci->buffer - oci->bufptr;
if (gotnow < sizeof(xReq)) {
YieldControlNoInput(fd);
YieldControlNoInput(client);
}
else {
request = (xReq *) oci->bufptr;
@@ -576,7 +575,7 @@ ResetCurrentRequest(ClientPtr client)
YieldControl();
}
else
YieldControlNoInput(fd);
YieldControlNoInput(client);
}
}

0 comments on commit d05c754

Please sign in to comment.