From: Juergen Perlinger <perlinger@ntp.org>
Date: Thu, 21 Jul 2016 06:49:13 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cffcf0d872e01d5fcc9c952b95a79507a05ca7ac;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p9
into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-3082

bk: 579070695ruaR-RoorbZwAUKBFA3jw
---

cffcf0d872e01d5fcc9c952b95a79507a05ca7ac
diff --cc ChangeLog
index ea4be80c7,e89f31a9a..413cd9217
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,12 @@@
  ---
+ * [Sec 3075] Malicious crafted read_mru_list() packet will crash ntpd.
+   - added missing paramter validation in read_mru_list(). perlinger@ntp.org
+ * [Sec 3082] (title too long -- Variation of [Sec 3075].)
+   - more hardening to read_mru_list(). perlinger@ntp.org
  
 +* git author attribution cleanup
 +* bk ignore file cleanup
++
  ---
  (4.2.8p8) 2016/06/02 Released by Harlan Stenn <stenn@ntp.org>