From 985a0e1774944aec2ddb9c92d563872f22f27b4b Mon Sep 17 00:00:00 2001
From: dhill <dhill@openbsd.org>
Date: Thu, 6 Apr 2017 02:11:08 +0000
Subject: [PATCH] Convert bcopy to memcpy as the memory does not overlap.

ok deraadt@
---
 sys/netinet6/ip6_input.c | 10 +++++-----
 sys/netinet6/mld6.c      |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index ac84ed1f413..20173d29804 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.181 2017/03/06 08:59:07 mpi Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.182 2017/04/06 02:11:08 dhill Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -777,7 +777,7 @@ ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen,
 				return (-1);
 			}
 			optlen = IP6OPT_RTALERT_LEN;
-			bcopy((caddr_t)(opt + 2), (caddr_t)&rtalert_val, 2);
+			memcpy((caddr_t)&rtalert_val, (caddr_t)(opt + 2), 2);
 			*rtalertp = ntohs(rtalert_val);
 			break;
 		case IP6OPT_JUMBO:
@@ -810,9 +810,9 @@ ip6_process_hopopts(struct mbuf *m, u_int8_t *opthead, int hbhlen,
 
 			/*
 			 * We may see jumbolen in unaligned location, so
-			 * we'd need to perform bcopy().
+			 * we'd need to perform memcpy().
 			 */
-			bcopy(opt + 2, &jumboplen, sizeof(jumboplen));
+			memcpy(&jumboplen, opt + 2, sizeof(jumboplen));
 			jumboplen = (u_int32_t)htonl(jumboplen);
 
 #if 1
@@ -935,7 +935,7 @@ ip6_savecontrol(struct inpcb *in6p, struct mbuf *m, struct mbuf **mp)
 	/* RFC 2292 sec. 5 */
 	if ((in6p->inp_flags & IN6P_PKTINFO) != 0) {
 		struct in6_pktinfo pi6;
-		bcopy(&ip6->ip6_dst, &pi6.ipi6_addr, sizeof(struct in6_addr));
+		memcpy(&pi6.ipi6_addr, &ip6->ip6_dst, sizeof(struct in6_addr));
 		if (IN6_IS_SCOPE_EMBED(&pi6.ipi6_addr))
 			pi6.ipi6_addr.s6_addr16[1] = 0;
 		pi6.ipi6_ifindex = m ? m->m_pkthdr.ph_ifidx : 0;
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 63d1d3e46b2..4ee6cde2e10 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mld6.c,v 1.50 2017/02/09 15:23:35 jca Exp $	*/
+/*	$OpenBSD: mld6.c,v 1.51 2017/04/06 02:11:08 dhill Exp $	*/
 /*	$KAME: mld6.c,v 1.26 2001/02/16 14:50:35 itojun Exp $	*/
 
 /*
@@ -109,7 +109,7 @@ mld6_init(void)
 	hbh_buf[3] = 0;
 	hbh_buf[4] = IP6OPT_ROUTER_ALERT;
 	hbh_buf[5] = IP6OPT_RTALERT_LEN - 2;
-	bcopy((caddr_t)&rtalert_code, &hbh_buf[6], sizeof(u_int16_t));
+	memcpy(&hbh_buf[6], (caddr_t)&rtalert_code, sizeof(u_int16_t));
 
 	ip6_opts.ip6po_hbh = hbh;
 }
-- 
2.20.1