diff --git a/RELNOTES b/RELNOTES index ae96ca2e..859a21d3 100644 --- a/RELNOTES +++ b/RELNOTES @@ -3,8 +3,6 @@ ? ????? 2022 Release Notes - NEW FEATURES - Please note that that ISC DHCP is licensed under the Mozilla Public License, MPL 2.0. Please see https://www.mozilla.org/en-US/MPL/2.0/ to read the MPL 2.0 license terms. @@ -36,6 +34,12 @@ by Eric Young (eay@cryptsoft.com). [Gitblab #253] CVE: CVS-2022-2928 +! Corrected a memory leak that occurs when unpacking a packet that has an + FQDN option (81) that contains a label whose lenght is greater than 63. + Thanks to VictorV of Cyber Kunlun Lab for reporting the issue. + [Gitblab #254] + CVE: CVS-2022-2929 + Changes since 4.4.2-P1 (New Features) - Two new OMAPI function calls were added, `dhcpctl_timed_connect()` diff --git a/common/options.c b/common/options.c index f0959cb2..25450e1d 100644 --- a/common/options.c +++ b/common/options.c @@ -454,16 +454,16 @@ int fqdn_universe_decode (struct option_state *options, while (s < &bp -> data[0] + length + 2) { len = *s; if (len > 63) { - log_info ("fancy bits in fqdn option"); - return 0; + log_info ("label length exceeds 63 in fqdn option"); + goto bad; } if (len == 0) { terminated = 1; break; } if (s + len > &bp -> data [0] + length + 3) { - log_info ("fqdn tag longer than buffer"); - return 0; + log_info ("fqdn label longer than buffer"); + goto bad; } if (first_len == 0) {