DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-04 08:55:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

nts: check for negative length in NNA_DecryptAuthEF()

Browse Source 
As other functions that accept a signed length, make sure it is sane in
NNA_DecryptAuthEF() too.
This commit is contained in:
Miroslav Lichvar
2020-07-09 13:13:13 +02:00
parent 72ee80debe
commit db54bfc0c1
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nts_ntp_auth.c
View File

@@ -128,6 +128,9 @@ NNA_DecryptAuthEF(NTP_Packet *packet, NTP_PacketInfo *info, SIV_Instance siv, in
void *ef_body; void *ef_body;
struct AuthHeader *header; struct AuthHeader *header;
if (buffer_length < 0)
return 0;
if (!NEF_ParseField(packet, info->length, ef_start, if (!NEF_ParseField(packet, info->length, ef_start,
NULL, &ef_type, &ef_body, &ef_body_length)) NULL, &ef_type, &ef_body, &ef_body_length))
return 0; return 0;

4
test/unit/nts_ntp_auth.c
View File

@@ -82,6 +82,10 @@ test_unit(void)
TEST_CHECK(r); TEST_CHECK(r);
TEST_CHECK(info.length - packet_length >= min_ef_length); TEST_CHECK(info.length - packet_length >= min_ef_length);
r = NNA_DecryptAuthEF(&packet, &info, siv, packet_length, plaintext2,
-1, &plaintext2_length);
TEST_CHECK(!r);
r = NNA_DecryptAuthEF(&packet, &info, siv, packet_length, plaintext2, r = NNA_DecryptAuthEF(&packet, &info, siv, packet_length, plaintext2,
sizeof (plaintext2), &plaintext2_length); sizeof (plaintext2), &plaintext2_length);
TEST_CHECK(r); TEST_CHECK(r);