Enhanced string boundary check to avoid crashes with malformed packets
This commit is contained in:
@@ -185,15 +185,17 @@ void ndpi_search_dns(struct ndpi_detection_module_struct *ndpi_struct, struct nd
|
||||
}
|
||||
|
||||
/* extract host name server */
|
||||
int j = 0, off = sizeof(struct ndpi_dns_packet_header) + 1;
|
||||
int j = 0, max_len = sizeof(flow->host_server_name)-1, off = sizeof(struct ndpi_dns_packet_header) + 1;
|
||||
|
||||
while(flow->packet.payload[off] != '\0' && off < flow->packet.payload_packet_len) {
|
||||
flow->host_server_name[j] = flow->packet.payload[off];
|
||||
if(j < strlen((char*)flow->host_server_name)) {
|
||||
if(j < max_len) {
|
||||
if(flow->host_server_name[j] < ' ')
|
||||
flow->host_server_name[j] = '.';
|
||||
j++;
|
||||
}
|
||||
} else
|
||||
break;
|
||||
|
||||
off++;
|
||||
}
|
||||
flow->host_server_name[j] = '\0';
|
||||
|
||||
@@ -324,7 +324,7 @@ void ndpi_search_netbios(struct ndpi_detection_module_struct *ndpi_struct, struc
|
||||
NDPI_LOG_DEBUG, "found netbios with checked ip-address.\n");
|
||||
|
||||
if(netbios_name_interpret((char*)&packet->payload[12], name, sizeof(name)) > 0)
|
||||
snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name), "%s", name);
|
||||
snprintf((char*)flow->host_server_name, sizeof(flow->host_server_name)-1, "%s", name);
|
||||
|
||||
ndpi_int_netbios_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user