Merge pull request #846 from catenacyber/fuzzofix
Fix various buffer over reads
This commit is contained in:
@@ -3846,6 +3846,10 @@ static int ndpi_init_packet_header(struct ndpi_detection_module_struct *ndpi_str
|
||||
if(flow->http.url) { ndpi_free(flow->http.url); flow->http.url = NULL; }
|
||||
if(flow->http.content_type) { ndpi_free(flow->http.content_type); flow->http.content_type = NULL; }
|
||||
if(flow->http.user_agent) { ndpi_free(flow->http.user_agent); flow->http.user_agent = NULL; }
|
||||
if(flow->kerberos_buf.pktbuf) {
|
||||
ndpi_free(flow->kerberos_buf.pktbuf);
|
||||
flow->kerberos_buf.pktbuf = NULL;
|
||||
}
|
||||
if(flow->l4.tcp.tls.message.buffer) {
|
||||
ndpi_free(flow->l4.tcp.tls.message.buffer);
|
||||
flow->l4.tcp.tls.message.buffer = NULL;
|
||||
|
||||
@@ -168,6 +168,9 @@ static int search_valid_dns(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
} else
|
||||
x += data_len;
|
||||
|
||||
if((x+2) >= flow->packet.payload_packet_len) {
|
||||
break;
|
||||
}
|
||||
rsp_type = get16(&x, flow->packet.payload);
|
||||
flow->protos.dns.rsp_type = rsp_type;
|
||||
|
||||
|
||||
@@ -137,7 +137,7 @@ static void ndpi_search_oscar_tcp_connect(struct ndpi_detection_module_struct
|
||||
+ TLVs | [Class: FLAP__SIGNON_TAGS] TLVs +
|
||||
+--------------------------------------------------+
|
||||
*/
|
||||
if(channel == SIGNON &&
|
||||
if(channel == SIGNON && packet->payload_packet_len >= 10 &&
|
||||
get_u_int16_t(packet->payload, 4) == htons(packet->payload_packet_len - 6) &&
|
||||
get_u_int32_t(packet->payload, 6) == htonl(FLAPVERSION))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user