some finger muscle workout:

bzero -> memset and (very few) bcopy -> memcpy/memmove

5 files changed, 55 insertions, 53 deletions

diff --git a/sys/net/pf.c b/sys/net/pf.c
index 4e2378a3f52..1f8ac7d0a84 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.1058 2018/01/19 12:57:15 bluhm Exp $ */
+/*	$OpenBSD: pf.c,v 1.1059 2018/02/06 09:16:11 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -497,7 +497,7 @@ pf_src_connlimit(struct pf_state **state)
 			    (*state)->key[PF_SK_WIRE]->af);
 		}
 
-		bzero(&p, sizeof(p));
+		memset(&p, 0, sizeof(p));
 		p.pfra_af = (*state)->key[PF_SK_WIRE]->af;
 		switch ((*state)->key[PF_SK_WIRE]->af) {
 		case AF_INET:
@@ -1148,7 +1148,7 @@ pf_state_export(struct pfsync_state *sp, struct pf_state *st)
 {
 	int32_t expire;
 
-	bzero(sp, sizeof(struct pfsync_state));
+	memset(sp, 0, sizeof(struct pfsync_state));
 
 	/* copy from state key */
 	sp->key[PF_SK_WIRE].addr[0] = st->key[PF_SK_WIRE]->addr[0];
@@ -2312,7 +2312,7 @@ pf_translate_af(struct pf_pdesc *pd)
 	switch (pd->naf) {
 	case AF_INET:
 		ip4 = mtod(pd->m, struct ip *);
-		bzero(ip4, hlen);
+		memset(ip4, 0, hlen);
 		ip4->ip_v   = IPVERSION;
 		ip4->ip_hl  = hlen >> 2;
 		ip4->ip_tos = pd->tos;
@@ -2326,7 +2326,7 @@ pf_translate_af(struct pf_pdesc *pd)
 		break;
 	case AF_INET6:
 		ip6 = mtod(pd->m, struct ip6_hdr *);
-		bzero(ip6, hlen);
+		memset(ip6, 0, hlen);
 		ip6->ip6_vfc  = IPV6_VERSION;
 		ip6->ip6_flow |= htonl((u_int32_t)pd->tos << 20);
 		ip6->ip6_plen = htons(dlen);
@@ -2407,7 +2407,7 @@ pf_change_icmp_af(struct mbuf *m, int ipoff2, struct pf_pdesc *pd,
 	switch (naf) {
 	case AF_INET:
 		ip4 = mtod(n, struct ip *);
-		bzero(ip4, sizeof(*ip4));
+		memset(ip4, 0, sizeof(*ip4));
 		ip4->ip_v   = IPVERSION;
 		ip4->ip_hl  = sizeof(*ip4) >> 2;
 		ip4->ip_len = htons(sizeof(*ip4) + pd2->tot_len - ohlen);
@@ -2424,7 +2424,7 @@ pf_change_icmp_af(struct mbuf *m, int ipoff2, struct pf_pdesc *pd,
 		break;
 	case AF_INET6:
 		ip6 = mtod(n, struct ip6_hdr *);
-		bzero(ip6, sizeof(*ip6));
+		memset(ip6, 0, sizeof(*ip6));
 		ip6->ip6_vfc  = IPV6_VERSION;
 		ip6->ip6_plen = htons(pd2->tot_len - ohlen);
 		if (pd2->proto == IPPROTO_ICMP)
@@ -2792,7 +2792,7 @@ pf_build_tcp(const struct pf_rule *r, sa_family_t af,
 	m->m_pkthdr.len = m->m_len = len;
 	m->m_pkthdr.ph_ifidx = 0;
 	m->m_pkthdr.csum_flags |= M_TCP_CSUM_OUT;
-	bzero(m->m_data, len);
+	memset(m->m_data, 0, len);
 	switch (af) {
 	case AF_INET:
 		h = mtod(m, struct ip *);
@@ -3398,7 +3398,7 @@ pf_set_rt_ifp(struct pf_state *s, struct pf_addr *saddr, sa_family_t af)
 	if (!r->rt)
 		return (0);
 
-	bzero(sns, sizeof(sns));
+	memset(sns, 0, sizeof(sns));
 	switch (af) {
 	case AF_INET:
 		rv = pf_map_addr(AF_INET, r, saddr, &s->rt_addr, NULL, sns,
@@ -3708,7 +3708,7 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm,
 	struct pf_test_ctx	 ctx;
 	int			 rv;
 
-	bzero(&ctx, sizeof(ctx));
+	memset(&ctx, 0, sizeof(ctx));
 	ctx.pd = pd;
 	ctx.rm = rm;
 	ctx.am = am;
@@ -4083,7 +4083,7 @@ pf_create_state(struct pf_pdesc *pd, struct pf_rule *r, struct pf_rule *a,
 	 * Make state responsible for rules it binds here.
 	 */
 	memcpy(&s->match_rules, rules, sizeof(s->match_rules));
-	bzero(rules, sizeof(*rules));
+	memset(rules, 0, sizeof(*rules));
 	STATE_INC_COUNTERS(s);
 
 	if (tag > 0) {
@@ -5054,7 +5054,7 @@ pf_test_state_icmp(struct pf_pdesc *pd, struct pf_state **state,
 		int		 ipoff2;
 
 		/* Initialize pd2 fields valid for both packets with pd. */
-		bzero(&pd2, sizeof(pd2));
+		memset(&pd2, 0, sizeof(pd2));
 		pd2.af = pd->af;
 		pd2.dir = pd->dir;
 		pd2.kif = pd->kif;
@@ -5926,7 +5926,7 @@ pf_route(struct pf_pdesc *pd, struct pf_rule *r, struct pf_state *s)
 	}
 
 	if (s == NULL) {
-		bzero(sns, sizeof(sns));
+		memset(sns, 0, sizeof(sns));
 		if (pf_map_addr(AF_INET, r,
 		    (struct pf_addr *)&ip->ip_src,
 		    &naddr, NULL, sns, &r->route, PF_SN_ROUTE)) {
@@ -6082,7 +6082,7 @@ pf_route6(struct pf_pdesc *pd, struct pf_rule *r, struct pf_state *s)
 	}
 
 	if (s == NULL) {
-		bzero(sns, sizeof(sns));
+		memset(sns, 0, sizeof(sns));
 		if (pf_map_addr(AF_INET6, r, (struct pf_addr *)&ip6->ip6_src,
 		    &naddr, NULL, sns, &r->route, PF_SN_ROUTE)) {
 			DPFPRINTF(LOG_ERR,
@@ -6230,7 +6230,7 @@ pf_get_divert(struct mbuf *m)
 		    M_NOWAIT);
 		if (mtag == NULL)
 			return (NULL);
-		bzero(mtag + 1, sizeof(struct pf_divert));
+		memset(mtag + 1, 0, sizeof(struct pf_divert));
 		m_tag_prepend(m, mtag);
 	}
 
@@ -6489,7 +6489,7 @@ int
 pf_setup_pdesc(struct pf_pdesc *pd, sa_family_t af, int dir,
     struct pfi_kif *kif, struct mbuf *m, u_short *reason)
 {
-	bzero(pd, sizeof(*pd));
+	memset(pd, 0, sizeof(*pd));
 	pd->dir = dir;
 	pd->kif = kif;		/* kif is NULL when called by pflog */
 	pd->m = m;
diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c
index 084ebf3a362..fdaf6eb9b66 100644
--- a/sys/net/pf_if.c
+++ b/sys/net/pf_if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_if.c,v 1.91 2017/05/30 20:00:48 deraadt Exp $ */
+/*	$OpenBSD: pf_if.c,v 1.92 2018/02/06 09:16:11 henning Exp $ */
 
 /*
  * Copyright 2005 Henning Brauer <henning@openbsd.org>
@@ -103,7 +103,7 @@ pfi_kif_find(const char *kif_name)
 {
 	struct pfi_kif_cmp	 s;
 
-	bzero(&s, sizeof(s));
+	memset(&s, 0, sizeof(s));
 	strlcpy(s.pfik_name, kif_name, sizeof(s.pfik_name));
 	return (RB_FIND(pfi_ifhead, &pfi_ifs, (struct pfi_kif *)&s));
 }
@@ -547,7 +547,7 @@ pfi_address_add(struct sockaddr *sa, sa_family_t af, u_int8_t net)
 	if (af == AF_INET && net > 32)
 		net = 128;
 	p = pfi_buffer + pfi_buffer_cnt++;
-	bzero(p, sizeof(*p));
+	memset(p, 0, sizeof(*p));
 	p->pfra_af = af;
 	p->pfra_net = net;
 	if (af == AF_INET)
@@ -617,8 +617,8 @@ pfi_update_status(const char *name, struct pf_status *pfs)
 
 	if (*name == '\0' && pfs == NULL) {
 		RB_FOREACH(p, pfi_ifhead, &pfi_ifs) {
-			bzero(p->pfik_packets, sizeof(p->pfik_packets));
-			bzero(p->pfik_bytes, sizeof(p->pfik_bytes));
+			memset(p->pfik_packets, 0, sizeof(p->pfik_packets));
+			memset(p->pfik_bytes, 0, sizeof(p->pfik_bytes));
 			p->pfik_tzero = time_second;
 		}
 		return;
@@ -634,14 +634,14 @@ pfi_update_status(const char *name, struct pf_status *pfs)
 		    sizeof(ifg_members));
 	} else {
 		/* build a temporary list for p only */
-		bzero(&p_member, sizeof(p_member));
+		memset(&p_member, 0, sizeof(p_member));
 		p_member.ifgm_ifp = p->pfik_ifp;
 		TAILQ_INIT(&ifg_members);
 		TAILQ_INSERT_TAIL(&ifg_members, &p_member, ifgm_next);
 	}
 	if (pfs) {
-		bzero(pfs->pcounters, sizeof(pfs->pcounters));
-		bzero(pfs->bcounters, sizeof(pfs->bcounters));
+		memset(pfs->pcounters, 0, sizeof(pfs->pcounters));
+		memset(pfs->bcounters, 0, sizeof(pfs->bcounters));
 	}
 	TAILQ_FOREACH(ifgm, &ifg_members, ifgm_next) {
 		if (ifgm->ifgm_ifp == NULL)
@@ -650,8 +650,8 @@ pfi_update_status(const char *name, struct pf_status *pfs)
 
 		/* just clear statistics */
 		if (pfs == NULL) {
-			bzero(p->pfik_packets, sizeof(p->pfik_packets));
-			bzero(p->pfik_bytes, sizeof(p->pfik_bytes));
+			memset(p->pfik_packets, 0, sizeof(p->pfik_packets));
+			memset(p->pfik_bytes, 0, sizeof(p->pfik_bytes));
 			p->pfik_tzero = time_second;
 			continue;
 		}
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 48e555b4261..a88a9466e86 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.327 2018/01/19 15:33:27 bluhm Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.328 2018/02/06 09:16:11 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -225,7 +225,7 @@ pfattach(int num)
 	pf_default_rule.route.addr.type =  PF_ADDR_NONE;
 
 	pf_normalize_init();
-	bzero(&pf_status, sizeof(pf_status));
+	memset(&pf_status, 0, sizeof(pf_status));
 	pf_status.debug = LOG_ERR;
 	pf_status.reass = PF_REASS_ENABLED;
 
@@ -1076,7 +1076,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			PF_UNLOCK();
 			break;
 		}
-		bcopy(qs, &pq->queue, sizeof(pq->queue));
+		memcpy(&pq->queue, qs, sizeof(pq->queue));
 		PF_UNLOCK();
 		break;
 	}
@@ -1105,7 +1105,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			PF_UNLOCK();
 			break;
 		}
-		bcopy(qs, &pq->queue, sizeof(pq->queue));
+		memcpy(&pq->queue, qs, sizeof(pq->queue));
 		/* It's a root flow queue but is not an HFSC root class */
 		if ((qs->flags & PFQS_FLOWQUEUE) && qs->parent_qid == 0 &&
 		    !(qs->flags & PFQS_ROOTCLASS))
@@ -1136,7 +1136,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			PF_UNLOCK();
 			break;
 		}
-		bcopy(&q->queue, qs, sizeof(*qs));
+		memcpy(qs, &q->queue, sizeof(*qs));
 		qs->qid = pf_qname2qid(qs->qname, 1);
 		if (qs->parent[0] && (qs->parent_qid =
 		    pf_qname2qid(qs->parent, 0)) == 0) {
@@ -1308,8 +1308,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			PF_UNLOCK();
 			break;
 		}
-		bcopy(rule, &pr->rule, sizeof(struct pf_rule));
-		bzero(&pr->rule.entries, sizeof(pr->rule.entries));
+		memcpy(&pr->rule, rule, sizeof(struct pf_rule));
+		memset(&pr->rule.entries, 0, sizeof(pr->rule.entries));
 		pr->rule.kif = NULL;
 		pr->rule.nat.kif = NULL;
 		pr->rule.rdr.kif = NULL;
@@ -1318,7 +1318,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		pr->rule.anchor = NULL;
 		pr->rule.overload_tbl = NULL;
 		pr->rule.pktrate.limit /= PF_THRESHOLD_MULT;
-		bzero(&pr->rule.gcle, sizeof(pr->rule.gcle));
+		memset(&pr->rule.gcle, 0, sizeof(pr->rule.gcle));
 		pr->rule.ruleset = NULL;
 		if (pf_anchor_copyout(ruleset, rule, pr)) {
 			error = EBUSY;
@@ -1657,7 +1657,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		struct pf_state		*s;
 		struct pf_state_cmp	 id_key;
 
-		bzero(&id_key, sizeof(id_key));
+		memset(&id_key, 0, sizeof(id_key));
 		id_key.id = ps->state.id;
 		id_key.creatorid = ps->state.creatorid;
 
@@ -1719,7 +1719,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 	case DIOCGETSTATUS: {
 		struct pf_status *s = (struct pf_status *)addr;
 		PF_LOCK();
-		bcopy(&pf_status, s, sizeof(struct pf_status));
+		memcpy(s, &pf_status, sizeof(struct pf_status));
 		pfi_update_status(s->ifname, s);
 		PF_UNLOCK();
 		break;
@@ -1730,7 +1730,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 
 		PF_LOCK();
 		if (pi->pfiio_name[0] == 0) {
-			bzero(pf_status.ifname, IFNAMSIZ);
+			memset(pf_status.ifname, 0, IFNAMSIZ);
 			PF_UNLOCK();
 			break;
 		}
@@ -1751,9 +1751,9 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			break;
 		}
 
-		bzero(pf_status.counters, sizeof(pf_status.counters));
-		bzero(pf_status.fcounters, sizeof(pf_status.fcounters));
-		bzero(pf_status.scounters, sizeof(pf_status.scounters));
+		memset(pf_status.counters, 0, sizeof(pf_status.counters));
+		memset(pf_status.fcounters, 0, sizeof(pf_status.fcounters));
+		memset(pf_status.scounters, 0, sizeof(pf_status.scounters));
 		pf_status.since = time_uptime;
 
 		PF_UNLOCK();
@@ -2218,7 +2218,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		ioe = malloc(sizeof(*ioe), M_TEMP, M_WAITOK);
 		table = malloc(sizeof(*table), M_TEMP, M_WAITOK);
 		pf_default_rule_new = pf_default_rule;
-		bzero(&pf_trans_set, sizeof(pf_trans_set));
+		memset(&pf_trans_set, 0, sizeof(pf_trans_set));
 		for (i = 0; i < io->size; i++) {
 			if (copyin(io->array+i, ioe, sizeof(*ioe))) {
 				free(table, M_TEMP, sizeof(*table));
@@ -2237,7 +2237,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			}
 			switch (ioe->type) {
 			case PF_TRANS_TABLE:
-				bzero(table, sizeof(*table));
+				memset(table, 0, sizeof(*table));
 				strlcpy(table->pfrt_anchor, ioe->anchor,
 				    sizeof(table->pfrt_anchor));
 				if ((error = pfr_ina_begin(table,
@@ -2303,7 +2303,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			}
 			switch (ioe->type) {
 			case PF_TRANS_TABLE:
-				bzero(table, sizeof(*table));
+				memset(table, 0, sizeof(*table));
 				strlcpy(table->pfrt_anchor, ioe->anchor,
 				    sizeof(table->pfrt_anchor));
 				if ((error = pfr_ina_rollback(table,
@@ -2423,7 +2423,7 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			}
 			switch (ioe->type) {
 			case PF_TRANS_TABLE:
-				bzero(table, sizeof(*table));
+				memset(table, 0, sizeof(*table));
 				strlcpy(table->pfrt_anchor, ioe->anchor,
 				    sizeof(table->pfrt_anchor));
 				if ((error = pfr_ina_commit(table, ioe->ticket,
@@ -2499,8 +2499,8 @@ pfioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 			if ((nr + 1) * sizeof(*p) > (unsigned)psn->psn_len)
 				break;
 
-			bcopy(n, pstore, sizeof(*pstore));
-			bzero(&pstore->entry, sizeof(pstore->entry));
+			memcpy(pstore, n, sizeof(*pstore));
+			memset(&pstore->entry, 0, sizeof(pstore->entry));
 			pstore->rule.ptr = NULL;
 			pstore->kif = NULL;
 			pstore->rule.nr = n->rule.ptr->nr;
@@ -2670,7 +2670,7 @@ pf_trans_set_commit(void)
 void
 pf_pool_copyin(struct pf_pool *from, struct pf_pool *to)
 {
-	bcopy(from, to, sizeof(*to));
+	memmove(to, from, sizeof(*to));
 	to->kif = NULL;
 }
 
diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c
index 4b2ba0ddcd4..5936531c8c2 100644
--- a/sys/net/pf_lb.c
+++ b/sys/net/pf_lb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_lb.c,v 1.61 2017/07/12 14:07:55 bluhm Exp $ */
+/*	$OpenBSD: pf_lb.c,v 1.62 2018/02/06 09:16:11 henning Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -155,7 +155,7 @@ pf_get_sport(struct pf_pdesc *pd, struct pf_rule *r,
 	int			sidx = pd->sidx;
 	int			didx = pd->didx;
 
-	bzero(&init_addr, sizeof(init_addr));
+	memset(&init_addr, 0, sizeof(init_addr));
 	if (pf_map_addr(pd->naf, r, &pd->nsaddr, naddr, &init_addr, sn, &r->nat,
 	    PF_SN_NAT))
 		return (1);
@@ -482,7 +482,8 @@ pf_map_addr(sa_family_t af, struct pf_rule *r, struct pf_addr *saddr,
 				 * reset counter in case its value
 				 * has been removed from the pool.
 				 */
-				bzero(&rpool->counter, sizeof(rpool->counter));
+				memset(&rpool->counter, 0,
+				    sizeof(rpool->counter));
 				if (pfr_pool_get(rpool, &raddr, &rmask, af))
 					return (1);
 			}
@@ -524,7 +525,8 @@ pf_map_addr(sa_family_t af, struct pf_rule *r, struct pf_addr *saddr,
 		    rpool->addr.type == PF_ADDR_DYNIFTL) {
 			if (pfr_pool_get(rpool, &raddr, &rmask, af)) {
 				/* see PF_POOL_ROUNDROBIN */
-				bzero(&rpool->counter, sizeof(rpool->counter));
+				memset(&rpool->counter, 0,
+				    sizeof(rpool->counter));
 				if (pfr_pool_get(rpool, &raddr, &rmask, af))
 					return (1);
 			}
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index 68308b027d3..f01e850d2c0 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_norm.c,v 1.208 2017/06/26 18:33:24 bluhm Exp $ */
+/*	$OpenBSD: pf_norm.c,v 1.209 2018/02/06 09:16:11 henning Exp $ */
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -1016,7 +1016,7 @@ pf_normalize_tcp_init(struct pf_pdesc *pd, struct pf_state_peer *src)
 	src->scrub = pool_get(&pf_state_scrub_pl, PR_NOWAIT);
 	if (src->scrub == NULL)
 		return (1);
-	bzero(src->scrub, sizeof(*src->scrub));
+	memset(src->scrub, 0, sizeof(*src->scrub));
 
 	switch (pd->af) {
 	case AF_INET: {