summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWlodek Wencel <wlodek@isc.org>2021-05-27 10:33:19 +0000
committerWlodek Wencel <wlodek@isc.org>2021-05-27 10:33:19 +0000
commit3b4d8377a3c58cda0ba57ccfb42236d221c01b0f (patch)
tree9bd4bce2ff29b6918b2db68400c6b81973d8c92b
parenteedab8b626f9acbb1b08e1c19154d7357ba6c347 (diff)
parent2390d2370159792f122027e2b9a6f3219145c3a6 (diff)
downloadisc-dhcp-3b4d8377a3c58cda0ba57ccfb42236d221c01b0f.tar.gz
Merge branch 'pre-release-4-1-esv-r16-p1' into v4_1_esv
-rw-r--r--README2
-rw-r--r--RELNOTES15
-rw-r--r--common/parse.c2
-rw-r--r--common/tests/option_unittest.c2
4 files changed, 11 insertions, 10 deletions
diff --git a/README b/README
index 96b5a043..3d141467 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
Internet Systems Consortium DHCP Distribution
Version 4.1-ESV-R16-P1
- 26 May 2020
+ 26 May 2021
README FILE
diff --git a/RELNOTES b/RELNOTES
index d5388494..38b155c4 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -8,8 +8,9 @@
NEW FEATURES
Version 4.1-ESV-R16-P1 is a security release of an extended support version
-(ESV) release. ESVs are intended for users who have longer upgrade
-constraints. Please see our web page:
+(ESV) fixing possible buffer overwrite error in client and server
+while parsing haxadecimal literals in lease file. ESVs are intended for
+users who have longer upgrade constraints. Please see our web page:
http://www.isc.org/downloads/software-support-policy/
@@ -75,11 +76,11 @@ Email Vicky Risk, Product Manager at vicky@isc.org or discuss on
dhcp-users@lists.isc.org.
Changes since 4.1-ESV-R16
-
-- Corrected a buffer overwrite possible when parsing hexadecimal
- literals with more than 1024 octets.
- [Gitlab #182]
- CVE: CVE-2021-25217
+ ! Corrected a buffer overwrite possible when parsing hexadecimal
+ literals with more than 1024 octets. Reported by Jon Franklin from Dell,
+ and also by Pawel Wieczorkiewicz from Amazon Web Services.
+ [Gitlab #182]
+ CVE: CVE-2021-25217
Changes since 4.1-ESV-R16b1
diff --git a/common/parse.c b/common/parse.c
index 57ae1793..656b378b 100644
--- a/common/parse.c
+++ b/common/parse.c
@@ -3,7 +3,7 @@
Common parser code for dhcpd and dhclient. */
/*
- * Copyright (c) 2004-2019 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2004-2021 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1995-2003 by Internet Software Consortium
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/common/tests/option_unittest.c b/common/tests/option_unittest.c
index bea60837..b71a1add 100644
--- a/common/tests/option_unittest.c
+++ b/common/tests/option_unittest.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2018-2021 Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this