diff options
| author | Ivan Poddubny <ivan.poddubny@gmail.com> | 2015-05-23 12:36:18 +0300 |
|---|---|---|
| committer | Ivan Poddubny <ivan.poddubny@gmail.com> | 2015-05-23 13:15:34 +0300 |
| commit | 70d54ab6c418e57db7660a2e00c51d1fcfe46771 (patch) | |
| tree | f99213b8ae6e40c77316d011472f32a3648d1cf6 /res/res_pjsip_transport_websocket.c | |
| parent | f66c41e668429b9a07dfdf30832c02ddc223f4a4 (diff) | |
res_pjsip_transport_websocket: Fix crash on receiving large SIP packets
Incoming SIP packets larger than PJSIP_MAX_PKT_LEN were themselves
truncated before passing to pjsip_tpmgr_receive_packet, but the length
was passed unaltered, thus causing memory corruption and segfault.
ASTERISK-25122 #close
Change-Id: I608a6b6b7f229eacc33a0a7d771d18e27e5b08ab
Diffstat (limited to 'res/res_pjsip_transport_websocket.c')
| -rw-r--r-- | res/res_pjsip_transport_websocket.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c index 70e5c2abf..914c8b8ff 100644 --- a/res/res_pjsip_transport_websocket.c +++ b/res/res_pjsip_transport_websocket.c @@ -197,12 +197,13 @@ static int transport_read(void *data) pjsip_rx_data *rdata = &newtransport->rdata; int recvd; pj_str_t buf; + int pjsip_pkt_len; pj_gettimeofday(&rdata->pkt_info.timestamp); - pj_memcpy(rdata->pkt_info.packet, read_data->payload, - PJSIP_MAX_PKT_LEN < read_data->payload_len ? PJSIP_MAX_PKT_LEN : read_data->payload_len); - rdata->pkt_info.len = read_data->payload_len; + pjsip_pkt_len = PJSIP_MAX_PKT_LEN < read_data->payload_len ? PJSIP_MAX_PKT_LEN : read_data->payload_len; + pj_memcpy(rdata->pkt_info.packet, read_data->payload, pjsip_pkt_len); + rdata->pkt_info.len = pjsip_pkt_len; rdata->pkt_info.zero = 0; pj_sockaddr_parse(pj_AF_UNSPEC(), 0, pj_cstr(&buf, ast_sockaddr_stringify(ast_websocket_remote_address(session))), &rdata->pkt_info.src_addr); |