From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 Jan 2016 09:53:06 +0000 (+0000)
Subject: [Sec 2935] use L_SUB instead of L_ISGT.  Juergen Perlinger
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d326a1e02174d779e82c0a0a0d8ad0836f79308;p=thirdparty%2Fntp.git

[Sec 2935] use L_SUB instead of L_ISGT.  Juergen Perlinger

bk: 5694cd02avDkTElfVb45RwCgT1Q3Rg
---

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index e45d48e21..5a7f4eab2 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -1292,6 +1292,7 @@ receive(
 		if (MODE_BROADCAST == hismode) {
 			u_char poll;
 			int bail = 0;
+			l_fp tdiff;
 
 			DPRINTF(2, ("receive: PROCPKT/BROADCAST: prev pkt %ld seconds ago, ppoll: %d, %d secs\n",
 				    (current_time - peer->timelastrec),
@@ -1334,7 +1335,9 @@ receive(
 				++bail;
 			}
 
-			if (L_ISGT(&peer->bxmt, &p_xmt)) {
+			tdiff = p_xmt;
+			L_SUB(&tdiff, &peer->bxmt);
+			if (tdiff.l_i < 0) {
 				msyslog(LOG_INFO, "receive: broadcast packet from %s contains non-monotonic timestamp: %#010x.%08x -> %#010x.%08x",
 					stoa(&rbufp->recv_srcadr),
 					peer->bxmt.l_ui, peer->bxmt.l_uf,