frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os: Check oc->trans_conn before using oc->fd in YieldControlNoInput 

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>
This commit is contained in:
Keith Packard 2017-05-17 09:57:28 -07:00 committed by Adam Jackson
parent 448a5586e9
commit d05c754e1b
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
os/io.c
View File

@ -183,10 +183,12 @@ YieldControl(void)
} }
static void static void
YieldControlNoInput(int fd) YieldControlNoInput(ClientPtr client)
{ {
OsCommPtr oc = client->osPrivate;
YieldControl(); YieldControl();
ospoll_reset_events(server_poll, fd); if (oc->trans_conn)
ospoll_reset_events(server_poll, oc->fd);
} }
static void static void
@ -226,7 +228,6 @@ ReadRequestFromClient(ClientPtr client)
{ {
OsCommPtr oc = (OsCommPtr) client->osPrivate; OsCommPtr oc = (OsCommPtr) client->osPrivate;
ConnectionInputPtr oci = oc->input; ConnectionInputPtr oci = oc->input;
int fd = oc->fd;
unsigned int gotnow, needed; unsigned int gotnow, needed;
int result; int result;
register xReq *request; register xReq *request;
@ -357,7 +358,7 @@ ReadRequestFromClient(ClientPtr client)
if (0) if (0)
#endif #endif
{ {
YieldControlNoInput(fd); YieldControlNoInput(client);
return 0; return 0;
} }
} }
@ -394,7 +395,7 @@ ReadRequestFromClient(ClientPtr client)
} }
if (gotnow < needed) { if (gotnow < needed) {
/* Still don't have enough; punt. */ /* Still don't have enough; punt. */
YieldControlNoInput(fd); YieldControlNoInput(client);
return 0; return 0;
} }
} }
@ -494,7 +495,6 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
{ {
OsCommPtr oc = (OsCommPtr) client->osPrivate; OsCommPtr oc = (OsCommPtr) client->osPrivate;
ConnectionInputPtr oci = oc->input; ConnectionInputPtr oci = oc->input;
int fd = oc->fd;
int gotnow, moveup; int gotnow, moveup;
NextAvailableInput(oc); NextAvailableInput(oc);
@ -533,7 +533,7 @@ InsertFakeRequest(ClientPtr client, char *data, int count)
(gotnow >= (int) (get_req_len((xReq *) oci->bufptr, client) << 2))) (gotnow >= (int) (get_req_len((xReq *) oci->bufptr, client) << 2)))
mark_client_ready(client); mark_client_ready(client);
else else
YieldControlNoInput(fd); YieldControlNoInput(client);
return TRUE; return TRUE;
} }
@ -548,7 +548,6 @@ ResetCurrentRequest(ClientPtr client)
{ {
OsCommPtr oc = (OsCommPtr) client->osPrivate; OsCommPtr oc = (OsCommPtr) client->osPrivate;
register ConnectionInputPtr oci = oc->input; register ConnectionInputPtr oci = oc->input;
int fd = oc->fd;
register xReq *request; register xReq *request;
int gotnow, needed; int gotnow, needed;
@ -557,7 +556,7 @@ ResetCurrentRequest(ClientPtr client)
oci->lenLastReq = 0; oci->lenLastReq = 0;
gotnow = oci->bufcnt + oci->buffer - oci->bufptr; gotnow = oci->bufcnt + oci->buffer - oci->bufptr;
if (gotnow < sizeof(xReq)) { if (gotnow < sizeof(xReq)) {
YieldControlNoInput(fd); YieldControlNoInput(client);
} }
else { else {
request = (xReq *) oci->bufptr; request = (xReq *) oci->bufptr;
@ -576,7 +575,7 @@ ResetCurrentRequest(ClientPtr client)
YieldControl(); YieldControl();
} }
else else
YieldControlNoInput(fd); YieldControlNoInput(client);
} }
} }