diff --git a/external/bsd/ntp/dist/ntpd/ntp_control.c b/external/bsd/ntp/dist/ntpd/ntp_control.c index 5b803067243a..da86a399d91d 100644 --- a/external/bsd/ntp/dist/ntpd/ntp_control.c +++ b/external/bsd/ntp/dist/ntpd/ntp_control.c @@ -1,4 +1,4 @@ -/* $NetBSD: ntp_control.c,v 1.9 2014/12/19 20:43:17 christos Exp $ */ +/* $NetBSD: ntp_control.c,v 1.10 2014/12/20 08:38:47 uebayasi Exp $ */ /* * ntp_control.c - respond to mode 6 control messages and send async @@ -1347,7 +1347,7 @@ ctl_putdata( /* * Not enough room in this one, flush it out. */ - currentlen = MIN(dlen, dataend - datapt); + currentlen = MIN(dlen, (unsigned int)(dataend - datapt)); memcpy(datapt, dp, currentlen); diff --git a/external/bsd/ntp/dist/sntp/networking.c b/external/bsd/ntp/dist/sntp/networking.c index 7c16f98a06ef..26126f9f349d 100644 --- a/external/bsd/ntp/dist/sntp/networking.c +++ b/external/bsd/ntp/dist/sntp/networking.c @@ -1,4 +1,4 @@ -/* $NetBSD: networking.c,v 1.8 2014/12/19 20:43:18 christos Exp $ */ +/* $NetBSD: networking.c,v 1.9 2014/12/20 08:38:47 uebayasi Exp $ */ #include #include "networking.h" @@ -82,7 +82,7 @@ skip_efields( while ((tail - head) > 6) { nlen = ntohl(*head++) & 0xffff; nlen = (nlen + 3) >> 2; - if (nlen > (tail - head) || nlen < 4) + if (nlen > (u_int)(tail - head) || nlen < 4) return NULL; /* Blooper! Inconsistent! */ head += nlen; }