[Sec 3361] 0rigin (zero origin) DoS.

bk: 58b56309OyBGP4pGEYHVzLh4VoQ8pg

diff --git a/ChangeLog b/ChangeLog
index fea59795fdd7782eef1c5c7f277764ee3748e9b8..bbaec14732bbab8ddb04df8cf544b99078508e75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 ---
 (4.2.8p10)
 
+* [Sec 3361] 0rigin (zero origin) DoS.  HStenn.
 * [Bug 3363] Support for openssl-1.1.0 without compatibility modes
   - rework of patch set from <ntp.org@eroen.eu>. <perlinger@ntp.org>
 * [Bug 3356] Bugfix 3072 breaks multicastclient <perlinger@ntp.org>

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 2d4fd052732b4d6183777f4550b6c03d858ea858..07090ede934fe60f32eefd62dd217673e94890d2 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1693,7 +1693,11 @@ receive(
                } else if (L_ISZERO(&p_org)) {
                        const char *action;
 
+#ifdef BUG3361
+                       msyslog(LOG_INFO,
+                               "receive: BUG 3361: Clearing peer->aorg ");
                        L_CLR(&peer->aorg);
+#endif
                        /**/
                        switch (hismode) {
                        /* We allow 0org for: */