ssh: adds systematic bounds checks in concat_hash_string
cf GHSL-2020-052
This commit is contained in:
@@ -110,10 +110,14 @@ static u_int16_t concat_hash_string(struct ndpi_packet_struct *packet,
|
||||
buf[buf_out_len++] = ';';
|
||||
offset += len;
|
||||
|
||||
if(offset+sizeof(u_int32_t) >= packet->payload_packet_len)
|
||||
goto invalid_payload;
|
||||
/* ssh.server_host_key_algorithms [None] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
offset += 4 + len;
|
||||
|
||||
if(offset+sizeof(u_int32_t) >= packet->payload_packet_len)
|
||||
goto invalid_payload;
|
||||
/* ssh.encryption_algorithms_client_to_server [C] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
|
||||
@@ -130,6 +134,8 @@ static u_int16_t concat_hash_string(struct ndpi_packet_struct *packet,
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
if(offset+sizeof(u_int32_t) >= packet->payload_packet_len)
|
||||
goto invalid_payload;
|
||||
/* ssh.encryption_algorithms_server_to_client [S] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
|
||||
@@ -146,6 +152,8 @@ static u_int16_t concat_hash_string(struct ndpi_packet_struct *packet,
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
if(offset+sizeof(u_int32_t) >= packet->payload_packet_len)
|
||||
goto invalid_payload;
|
||||
/* ssh.mac_algorithms_client_to_server [C] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
|
||||
@@ -162,6 +170,8 @@ static u_int16_t concat_hash_string(struct ndpi_packet_struct *packet,
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
if(offset+sizeof(u_int32_t) >= packet->payload_packet_len)
|
||||
goto invalid_payload;
|
||||
/* ssh.mac_algorithms_server_to_client [S] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
|
||||
@@ -195,6 +205,8 @@ static u_int16_t concat_hash_string(struct ndpi_packet_struct *packet,
|
||||
} else
|
||||
offset += 4 + len;
|
||||
|
||||
if(offset+sizeof(u_int32_t) >= packet->payload_packet_len)
|
||||
goto invalid_payload;
|
||||
/* ssh.compression_algorithms_server_to_client [S] */
|
||||
len = ntohl(*(u_int32_t*)&packet->payload[offset]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user