source/collectd
1
0
Fork 0
mirror of https://github.com/collectd/collectd.git synced 2026-02-09 04:09:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix endless loop DOS in parse_packet()

Browse Source 
When correct 'Signature part' is received by Collectd, configured without
AuthFile option, condition for endless loop occurs due to missing increase
of pointer to next unprocessed part.

Fixes: CVE-2017-7401
Closes: #2174
This commit is contained in:
Pavel Rochnyack
2017-04-03 11:57:09 +06:00
parent 9df9c6e98e
commit 82cb106ff4
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/network.c
View File

@@ -1050,14 +1050,6 @@ static int parse_part_sign_sha256 (sockent_t *se, /* {{{ */
buffer_len = *ret_buffer_len;
buffer_offset = 0;
if (se->data.server.userdb == NULL)
{
c_complain (LOG_NOTICE, &complain_no_users,
"network plugin: Received signed network packet but can't verify it "
"because no user DB has been configured. Will accept it.");
return (0);
}
/* Check if the buffer has enough data for this structure. */
if (buffer_len <= PART_SIGNATURE_SHA256_SIZE)
return (-ENOMEM);
@@ -1075,6 +1067,18 @@ static int parse_part_sign_sha256 (sockent_t *se, /* {{{ */
return (-1);
}
if (se->data.server.userdb == NULL)
{
c_complain (LOG_NOTICE, &complain_no_users,
"network plugin: Received signed network packet but can't verify it "
"because no user DB has been configured. Will accept it.");
*ret_buffer = buffer + pss_head_length;
*ret_buffer_len -= pss_head_length;
return (0);
}
/* Copy the hash. */
BUFFER_READ (pss.hash, sizeof (pss.hash));