From c62812877398840dae0ba74b03e9e6a43cc56fc5 Mon Sep 17 00:00:00 2001 From: glebius Date: Mon, 26 Oct 2015 11:35:40 +0000 Subject: Upgrade NTP to 4.2.8p4. Security: FreeBSD-SA-15:25.ntp Security: CVE-2015-7871 Security: CVE-2015-7855 Security: CVE-2015-7854 Security: CVE-2015-7853 Security: CVE-2015-7852 Security: CVE-2015-7851 Security: CVE-2015-7850 Security: CVE-2015-7849 Security: CVE-2015-7848 Security: CVE-2015-7701 Security: CVE-2015-7703 Security: CVE-2015-7704, CVE-2015-7705 Security: CVE-2015-7691, CVE-2015-7692, CVE-2015-7702 --- contrib/ntp/ntpd/ntp_request.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'contrib/ntp/ntpd/ntp_request.c') diff --git a/contrib/ntp/ntpd/ntp_request.c b/contrib/ntp/ntpd/ntp_request.c index 8ffebad..6073f99 100644 --- a/contrib/ntp/ntpd/ntp_request.c +++ b/contrib/ntp/ntpd/ntp_request.c @@ -1757,10 +1757,12 @@ do_restrict( } /* - * Looks okay, try it out + * Looks okay, try it out. Needs to reload data pointer and + * item counter. (Talos-CAN-0052) */ ZERO_SOCK(&matchaddr); ZERO_SOCK(&matchmask); + items = INFO_NITEMS(inpkt->err_nitems); datap = inpkt->u.data; while (items-- > 0) { @@ -1917,9 +1919,11 @@ reset_peer( } /* - * Now do it in earnest. + * Now do it in earnest. Needs to reload data pointer and item + * counter. (Talos-CAN-0052) */ - + + items = INFO_NITEMS(inpkt->err_nitems); datap = inpkt->u.data; while (items-- > 0) { ZERO(cp); -- cgit v1.1