9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ssld: change_connid may be called with an unknown ID

Browse source 
If change_connid is called with an unknown ID, conn will be
NULL, check this with an assert and then respond by reporting
the new ID as closed instead of dereferencing a NULL pointer.
This commit is contained in:
Simon Arlott 2016-02-10 21:22:50 +00:00 committed by William Pitcock
parent b1f028e5d4
commit b7cca0143d
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ssld/ssld.c
View file

@ -829,6 +829,20 @@ change_connid(mod_ctl_t *ctl, mod_ctl_buf_t *ctlb)
uint32_t id = buf_to_uint32(&ctlb->buf[1]); uint32_t id = buf_to_uint32(&ctlb->buf[1]);
uint32_t newid = buf_to_uint32(&ctlb->buf[5]); uint32_t newid = buf_to_uint32(&ctlb->buf[5]);
conn_t *conn = conn_find_by_id(id); conn_t *conn = conn_find_by_id(id);
lrb_assert(conn != NULL);
if(conn == NULL)
{
char buf[256];
int len;
buf[0] = 'D';
uint32_to_buf(&buf[1], newid);
sprintf(&buf[5], "connid %d does not exist", id);
len = (strlen(&buf[5]) + 1) + 5;
mod_cmd_write_queue(ctl, buf, len);
return;
}
rb_dlinkDelete(&conn->node, connid_hash(conn->id)); rb_dlinkDelete(&conn->node, connid_hash(conn->id));
SetZipSSL(conn); SetZipSSL(conn);
conn->id = newid; conn->id = newid;