 @@ -1,14 +1,14 @@
-#	$NetBSD: 3RDPARTY,v 1.1640.2.4 2019/10/12 14:44:31 martin Exp $
+#	$NetBSD: 3RDPARTY,v 1.1640.2.5 2019/10/16 17:41:40 martin Exp $
+#
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
+#
 # When you make changes to this software, be sure to discuss it with the
 # maintainer and contribute your patches.  Divergence from the official
 # sources is not desirable, and should be avoided as much as possible.
+#
 # When importing, please deal with the RCS IDs in this way:
 #   1. Preserve the RCS IDs in the files by removing the $ signs from
 #      the IDs before you do the import.
 #   2. After the import, add NetBSD RCS IDs to all of the files.
+#
 @@ -331,32 +331,32 @@ Archive Site:	ftp://ftp.isc.org/isc/dhcp
 Home Page:	http://www.isc.org/software/dhcp/
 Date:		2019-01-09
 Mailing List:	dhcp-server@isc.org
 Mailing List:	dhcp-client@isc.org
 Mailing List:	dhcp-announce@isc.org
 Mailing List:	dhcp-bugs@isc.org
 Responsible:	mellon
 License:	MPL
 Location:	external/mpl/dhcp
 Notes:
 Use the dhcp2netbsd script.
 Package:	dhcpcd
-Version:	8.1.0
+Version:	8.1.1
-Current Vers:	8.1.0
+Current Vers:	8.1.1
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/
-Date:		2019-10-12
+Date:		2019-10-16
 Mailing List: 	dhcpcd-discuss@marples.name
 License:	BSD (2-clause)
 Location:	external/bsd/dhcpcd/dist
 Notes:
 Please submit all changes to the author.
 Package:       drm
 Version:       Linux 3.15
 Current Vers:  ?
 Maintainer:    Intel, AMD, Linux kernel developers
 Archive Site:  git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 Home Page:     http://dri.freedesktop.org/
 Mailing List:  dri-devel@lists.freedesktop.org

 @@ -19,27 +19,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef CONFIG_H
 #define CONFIG_H
 #define PACKAGE			"dhcpcd"
-#define VERSION			"8.1.0"
+#define VERSION			"8.1.1"
 #ifndef CONFIG
 # define CONFIG			SYSCONFDIR "/" PACKAGE ".conf"
 #endif
 #ifndef SCRIPT
 # define SCRIPT			LIBEXECDIR "/" PACKAGE "-run-hooks"
 #endif
 #ifndef DEVDIR
 # define DEVDIR			LIBDIR "/" PACKAGE "/dev"
 #endif
 #ifndef DUID
 # define DUID			DBDIR "/duid"
 #endif

 @@ -154,28 +154,26 @@ dhcp_printoptions(const struct dhcpcd_ct
 			if (opt->option == opt2->option)
 				break;
 		if (j == opts_len) {
 			cols = printf("%03d %s", opt->option, opt->var);
 			dhcp_print_option_encoding(opt, cols);
+		}
+	}
 	for (i = 0, opt = opts; i < opts_len; i++, opt++) {
 		cols = printf("%03d %s", opt->option, opt->var);
 		dhcp_print_option_encoding(opt, cols);
+	}
+}
 #define get_option_raw(ctx, bootp, bootp_len, opt)	\
 	get_option((ctx), (bootp), (bootp_len), NULL)
 static const uint8_t *
 get_option(struct dhcpcd_ctx *ctx,
     const struct bootp *bootp, size_t bootp_len,
     unsigned int opt, size_t *opt_len)
+{
 	const uint8_t *p, *e;
 	uint8_t l, o, ol, overl, *bp;
 	const uint8_t *op;
 	size_t bl;
 	/* Check we have the magic cookie */
 	if (!IS_DHCP(bootp)) {
 		errno = ENOTSUP;
 @@ -3265,91 +3263,113 @@ get_udp_data(void *packet, size_t *len)
 	size_t ip_hl = (size_t)ip->ip_hl * 4;
 	char *p = packet;
 	p += ip_hl + sizeof(struct udphdr);
 	*len = (size_t)ntohs(ip->ip_len) - sizeof(struct udphdr) - ip_hl;
 	return p;
+}
 static bool
 is_packet_udp_bootp(void *packet, size_t plen)
+{
 	struct ip *ip = packet;
 	size_t ip_hlen;
-	struct udphdr *udp;
+	struct udphdr udp;
-	if (sizeof(*ip) > plen)
+	if (plen < sizeof(*ip))
 		return false;
 	if (ip->ip_v != IPVERSION || ip->ip_p != IPPROTO_UDP)
 		return false;
 	/* Sanity. */
-	if (ntohs(ip->ip_len) != plen)
+	if (ntohs(ip->ip_len) > plen)
 		return false;
 	ip_hlen = (size_t)ip->ip_hl * 4;
 	if (ip_hlen < sizeof(*ip))
 		return false;
 	/* Check we have a UDP header and BOOTP. */
-	if (ip_hlen + sizeof(*udp) + offsetof(struct bootp, vend) > plen)
+	if (ip_hlen + sizeof(udp) + offsetof(struct bootp, vend) > plen)
 		return false;
 	/* Sanity. */
 	memcpy(&udp, (char *)ip + ip_hlen, sizeof(udp));
 	if (ntohs(udp.uh_ulen) < sizeof(udp))
 		return false;
 	if (ip_hlen + ntohs(udp.uh_ulen) > plen)
 		return false;
 	/* Check it's to and from the right ports. */
-	udp = (struct udphdr *)(void *)((char *)ip + ip_hlen);
+	if (udp.uh_dport != htons(BOOTPC) || udp.uh_sport != htons(BOOTPS))
 	if (udp->uh_dport != htons(BOOTPC) || udp->uh_sport != htons(BOOTPS))
 		return false;
 	return true;
+}
 /* Lengths have already been checked. */
 static bool
 checksums_valid(void *packet,
     struct in_addr *from, unsigned int flags)
+{
 	struct ip *ip = packet;
-	struct ip pseudo_ip = {
+	union pip {
-		.ip_p = IPPROTO_UDP,
+		struct ip ip;
-		.ip_src = ip->ip_src,
+		uint16_t w[sizeof(struct ip)];
-		.ip_dst = ip->ip_dst
+	} pip = {
 		.ip.ip_p = IPPROTO_UDP,
 		.ip.ip_src = ip->ip_src,
 		.ip.ip_dst = ip->ip_dst,
 	};
 	size_t ip_hlen;
-	uint16_t udp_len, uh_sum;
+	struct udphdr udp;
-	struct udphdr *udp;
+	char *udpp, *uh_sump;
 	uint32_t csum;
 	if (from != NULL)
 		from->s_addr = ip->ip_src.s_addr;
 	ip_hlen = (size_t)ip->ip_hl * 4;
 	if (in_cksum(ip, ip_hlen, NULL) != 0)
 		return false;
 	if (flags & BPF_PARTIALCSUM)
-		return 0;
+		return true;
-	udp = (struct udphdr *)(void *)((char *)ip + ip_hlen);
+	udpp = (char *)ip + ip_hlen;
-	if (udp->uh_sum == 0)
+	memcpy(&udp, udpp, sizeof(udp));
-		return 0;
+	if (udp.uh_sum == 0)
 		return true;
 	/* UDP checksum is based on a pseudo IP header alongside
 	 * the UDP header and payload. */
-	udp_len = ntohs(udp->uh_ulen);
+	pip.ip.ip_len = udp.uh_ulen;
 	uh_sum = udp->uh_sum;
 	udp->uh_sum = 0;
 	pseudo_ip.ip_len = udp->uh_ulen;
 	csum = 0;
 	in_cksum(&pseudo_ip, sizeof(pseudo_ip), &csum);
-	csum = in_cksum(udp, udp_len, &csum);
+	/* Need to zero the UDP sum in the packet for the checksum to work. */
-	return csum == uh_sum;
+	uh_sump = udpp + offsetof(struct udphdr, uh_sum);
 	memset(uh_sump, 0, sizeof(udp.uh_sum));
 	/* Checksum psuedo header and then UDP + payload. */
 	in_cksum(pip.w, sizeof(pip.w), &csum);
 	csum = in_cksum(udpp, ntohs(udp.uh_ulen), &csum);
 #if 0	/* Not needed, just here for completeness. */
 	/* Put the checksum back. */
 	memcpy(uh_sump, &udp.uh_sum, sizeof(udp.uh_sum));
 #endif
 	return csum == udp.uh_sum;
+}
 static void
 dhcp_handlebootp(struct interface *ifp, struct bootp *bootp, size_t len,
     struct in_addr *from)
+{
 	size_t v;
 	if (len < offsetof(struct bootp, vend)) {
 		logerrx("%s: truncated packet (%zu) from %s",
 		    ifp->name, len, inet_ntoa(*from));
 		return;
+	}

 @@ -1974,32 +1974,30 @@ printpidfile:
+	}
 #else
 	if (control_start(&ctx,
 	    ctx.options & DHCPCD_MASTER ? NULL : argv[optind]) == -1)
+	{
 		logerr("%s: control_start", __func__);
 		goto exit_failure;
+	}
 #endif
 	logdebugx(PACKAGE "-" VERSION " starting");
 	ctx.options |= DHCPCD_STARTED;
 #ifdef HAVE_SETPROCTITLE
 	setproctitle("%s%s%s",
 	    ctx.options & DHCPCD_MASTER ? "[master]" : argv[optind],
 	    ctx.options & DHCPCD_IPV4 ? " [ip4]" : "",
 	    ctx.options & DHCPCD_IPV6 ? " [ip6]" : "");
 #endif
 	if (if_opensockets(&ctx) == -1) {
 		logerr("%s: if_opensockets", __func__);
 		goto exit_failure;
+	}
 #ifndef SMALL
 	dhcpcd_setlinkrcvbuf(&ctx);
 #endif
 	/* When running dhcpcd against a single interface, we need to retain
 	 * the old behaviour of waiting for an IP address */
 	if (ctx.ifc == 1 && !(ctx.options & DHCPCD_BACKGROUND))
 		ctx.options |= DHCPCD_WAITIP;
 @@ -2145,19 +2143,22 @@ exit1:
+	}
 	if_closesockets(&ctx);
 	free_globals(&ctx);
 #ifdef INET6
 	ipv6_ctxfree(&ctx);
 #endif
 	dev_stop(&ctx);
 	eloop_free(ctx.eloop);
 	if (ctx.options & DHCPCD_STARTED && !(ctx.options & DHCPCD_FORKED))
 		loginfox(PACKAGE " exited");
 	logclose();
 	free(ctx.logfile);
 #ifdef SETPROCTITLE_H
 	setproctitle_free();
 #endif
 #ifdef USE_SIGNALS
 	if (ctx.options & DHCPCD_FORKED)
 		_exit(i); /* so atexit won't remove our pidfile */
 #endif
 	return i;
+}

 @@ -1243,27 +1243,29 @@ ipv6_handleifa(struct dhcpcd_ctx *ctx,
 #endif
 out:
 	/* Done with the ia now, so free it. */
 	if (cmd == RTM_DELADDR)
 		ipv6_freeaddr(ia);
 	else if (!(ia->addr_flags & IN6_IFF_NOTUSEABLE))
 		ia->flags |= IPV6_AF_DADCOMPLETED;
 	/* If we've not already called rt_build via the IPv6ND
 	 * or DHCP6 handlers and the existance of any useable
 	 * global address on the interface has changed,
 	 * call rt_build to add/remove the default route. */
-	if (ifp->active && ifp->options->options & DHCPCD_IPV6 &&
+	if (ifp->active &&
 	    ((ifp->options != NULL && ifp->options->options & DHCPCD_IPV6) ||
 	     (ifp->options == NULL && ctx->options & DHCPCD_IPV6)) &&
 	    !(ctx->options & DHCPCD_RTBUILD) &&
 	    (ipv6_anyglobal(ifp) != NULL) != anyglobal)
 		rt_build(ctx, AF_INET6);
+}
 int
 ipv6_hasaddr(const struct interface *ifp)
+{
 	if (ipv6nd_iffindaddr(ifp, NULL, 0) != NULL)
 		return 1;
 #ifdef DHCP6
 	if (dhcp6_iffindaddr(ifp, NULL, 0) != NULL)