summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/net/bpf.c4
-rw-r--r--sys/net/bridgestp.c8
-rw-r--r--sys/net/if_bridge.c26
-rw-r--r--sys/net/if_ethersubr.c6
-rw-r--r--sys/net/if_media.c9
-rw-r--r--sys/net/if_trunk.c20
-rw-r--r--sys/net/if_vlan.c8
7 files changed, 39 insertions, 42 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index bcca3ea28f9..f19f2fc9bf5 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf.c,v 1.127 2015/09/13 17:53:44 mpi Exp $ */
+/* $OpenBSD: bpf.c,v 1.128 2015/09/29 10:11:40 deraadt Exp $ */
/* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */
/*
@@ -1513,7 +1513,7 @@ bpfdetach(struct ifnet *ifp)
}
}
- free(bp, M_DEVBUF, 0);
+ free(bp, M_DEVBUF, sizeof *bp);
} else
pbp = &bp->bif_next;
}
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 9665e60ef21..ffa79c51374 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bridgestp.c,v 1.59 2015/07/17 18:15:41 mpi Exp $ */
+/* $OpenBSD: bridgestp.c,v 1.60 2015/09/29 10:11:40 deraadt Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -1934,7 +1934,7 @@ bstp_destroy(struct bstp_state *bs)
if (!LIST_EMPTY(&bs->bs_bplist))
panic("bstp still active");
- free(bs, M_DEVBUF, 0);
+ free(bs, M_DEVBUF, sizeof *bs);
}
void
@@ -2008,9 +2008,7 @@ bstp_delete(struct bstp_port *bp)
hook_disestablish(ifp->if_linkstatehooks, bp->bp_lhcookie);
LIST_REMOVE(bp, bp_next);
- bp->bp_bs = NULL;
- bp->bp_active = 0;
- free(bp, M_DEVBUF, 0);
+ free(bp, M_DEVBUF, sizeof *bp);
bstp_initialization(bs);
}
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index b97b8de197b..53c229b94ad 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.264 2015/09/10 16:41:30 mikeb Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.265 2015/09/29 10:11:40 deraadt Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -192,7 +192,7 @@ bridge_clone_create(struct if_clone *ifc, int unit)
sc->sc_stp = bstp_create(&sc->sc_if);
if (!sc->sc_stp) {
- free(sc, M_DEVBUF, 0);
+ free(sc, M_DEVBUF, sizeof *sc);
return (ENOMEM);
}
@@ -240,7 +240,7 @@ bridge_clone_destroy(struct ifnet *ifp)
bridge_delete(sc, bif);
while ((bif = TAILQ_FIRST(&sc->sc_spanlist)) != NULL) {
TAILQ_REMOVE(&sc->sc_spanlist, bif, next);
- free(bif, M_DEVBUF, 0);
+ free(bif, M_DEVBUF, sizeof *bif);
}
bstp_destroy(sc->sc_stp);
@@ -254,7 +254,7 @@ bridge_clone_destroy(struct ifnet *ifp)
if_detach(ifp);
- free(sc, M_DEVBUF, 0);
+ free(sc, M_DEVBUF, sizeof *sc);
return (0);
}
@@ -272,7 +272,7 @@ bridge_delete(struct bridge_softc *sc, struct bridge_iflist *p)
TAILQ_REMOVE(&sc->sc_iflist, p, next);
bridge_rtdelete(sc, p->ifp, 0);
bridge_flushrule(p);
- free(p, M_DEVBUF, 0);
+ free(p, M_DEVBUF, sizeof *p);
return (error);
}
@@ -445,7 +445,7 @@ bridge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
if (strncmp(p->ifp->if_xname, req->ifbr_ifsname,
sizeof(p->ifp->if_xname)) == 0) {
TAILQ_REMOVE(&sc->sc_spanlist, p, next);
- free(p, M_DEVBUF, 0);
+ free(p, M_DEVBUF, sizeof *p);
break;
}
}
@@ -818,7 +818,7 @@ bridge_bifconf(struct bridge_softc *sc, struct ifbifconf *bifc)
done:
if (breq != NULL)
- free(breq, M_DEVBUF, 0);
+ free(breq, M_DEVBUF, sizeof *breq);
bifc->ifbic_len = i * sizeof(*breq);
return (error);
}
@@ -1742,7 +1742,7 @@ bridge_rtage(struct bridge_softc *sc)
p = LIST_NEXT(n, brt_next);
LIST_REMOVE(n, brt_next);
sc->sc_brtcnt--;
- free(n, M_DEVBUF, 0);
+ free(n, M_DEVBUF, sizeof *n);
n = p;
}
}
@@ -1801,7 +1801,7 @@ bridge_rtflush(struct bridge_softc *sc, int full)
p = LIST_NEXT(n, brt_next);
LIST_REMOVE(n, brt_next);
sc->sc_brtcnt--;
- free(n, M_DEVBUF, 0);
+ free(n, M_DEVBUF, sizeof *n);
n = p;
} else
n = LIST_NEXT(n, brt_next);
@@ -1823,7 +1823,7 @@ bridge_rtdaddr(struct bridge_softc *sc, struct ether_addr *ea)
if (bcmp(ea, &p->brt_addr, sizeof(p->brt_addr)) == 0) {
LIST_REMOVE(p, brt_next);
sc->sc_brtcnt--;
- free(p, M_DEVBUF, 0);
+ free(p, M_DEVBUF, sizeof *p);
return (0);
}
}
@@ -1860,7 +1860,7 @@ bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int dynonly)
p = LIST_NEXT(n, brt_next);
LIST_REMOVE(n, brt_next);
sc->sc_brtcnt--;
- free(n, M_DEVBUF, 0);
+ free(n, M_DEVBUF, sizeof *n);
n = p;
}
}
@@ -2039,7 +2039,7 @@ bridge_flushrule(struct bridge_iflist *bif)
#if NPF > 0
pf_tag_unref(p->brl_tag);
#endif
- free(p, M_DEVBUF, 0);
+ free(p, M_DEVBUF, sizeof *p);
}
while (!SIMPLEQ_EMPTY(&bif->bif_brlout)) {
p = SIMPLEQ_FIRST(&bif->bif_brlout);
@@ -2047,7 +2047,7 @@ bridge_flushrule(struct bridge_iflist *bif)
#if NPF > 0
pf_tag_unref(p->brl_tag);
#endif
- free(p, M_DEVBUF, 0);
+ free(p, M_DEVBUF, sizeof *p);
}
}
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 39582a53cfa..ee86161095f 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.227 2015/09/27 16:50:40 stsp Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.228 2015/09/29 10:11:40 deraadt Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -537,7 +537,7 @@ ether_ifdetach(struct ifnet *ifp)
enm != NULL;
enm = LIST_FIRST(&ac->ac_multiaddrs)) {
LIST_REMOVE(enm, enm_list);
- free(enm, M_IFMADDR, 0);
+ free(enm, M_IFMADDR, sizeof *enm);
}
}
@@ -821,7 +821,7 @@ ether_delmulti(struct ifreq *ifr, struct arpcom *ac)
* No remaining claims to this record; unlink and free it.
*/
LIST_REMOVE(enm, enm_list);
- free(enm, M_IFMADDR, 0);
+ free(enm, M_IFMADDR, sizeof *enm);
ac->ac_multicnt--;
if (memcmp(addrlo, addrhi, ETHER_ADDR_LEN) != 0)
ac->ac_multirangecnt--;
diff --git a/sys/net/if_media.c b/sys/net/if_media.c
index 8e683b94423..8e490476872 100644
--- a/sys/net/if_media.c
+++ b/sys/net/if_media.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_media.c,v 1.27 2015/09/11 13:02:28 stsp Exp $ */
+/* $OpenBSD: if_media.c,v 1.28 2015/09/29 10:11:40 deraadt Exp $ */
/* $NetBSD: if_media.c,v 1.10 2000/03/13 23:52:39 soren Exp $ */
/*-
@@ -308,13 +308,14 @@ ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
nwords++;
if (ifmr->ifm_count != 0) {
- size_t minwords;
+ size_t minwords, ksiz;
uint64_t *kptr;
minwords = nwords > (size_t)ifmr->ifm_count ?
(size_t)ifmr->ifm_count : nwords;
kptr = mallocarray(nwords, sizeof(*kptr), M_TEMP,
M_WAITOK | M_ZERO);
+ ksiz = nwords * sizeof(*kptr);
/*
* Get the media words from the interface's list.
*/
@@ -327,7 +328,7 @@ ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
nwords * sizeof(*kptr));
else
error = E2BIG;
- free(kptr, M_TEMP, 0);
+ free(kptr, M_TEMP, ksiz);
}
ifmr->ifm_count = nwords;
break;
@@ -380,7 +381,7 @@ ifmedia_delete_instance(struct ifmedia *ifm, uint64_t inst)
if (inst == IFM_INST_ANY ||
inst == IFM_INST(ife->ifm_media)) {
TAILQ_REMOVE(&ifm->ifm_list, ife, ifm_list);
- free(ife, M_IFADDR, 0);
+ free(ife, M_IFADDR, sizeof *ife);
}
}
}
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index 29f9327f288..a98bd9ed44c 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_trunk.c,v 1.117 2015/09/28 08:24:53 mpi Exp $ */
+/* $OpenBSD: if_trunk.c,v 1.118 2015/09/29 10:11:40 deraadt Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -156,8 +156,7 @@ trunk_clone_create(struct if_clone *ifc, int unit)
struct ifnet *ifp;
int i, error = 0;
- if ((tr = malloc(sizeof(struct trunk_softc),
- M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL)
+ if ((tr = malloc(sizeof *tr, M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL)
return (ENOMEM);
tr->tr_unit = unit;
@@ -166,7 +165,7 @@ trunk_clone_create(struct if_clone *ifc, int unit)
if (trunk_protos[i].ti_proto == TRUNK_PROTO_DEFAULT) {
tr->tr_proto = trunk_protos[i].ti_proto;
if ((error = trunk_protos[i].ti_attach(tr)) != 0) {
- free(tr, M_DEVBUF, 0);
+ free(tr, M_DEVBUF, sizeof *tr);
return (error);
}
break;
@@ -231,7 +230,7 @@ trunk_clone_destroy(struct ifnet *ifp)
if_detach(ifp);
SLIST_REMOVE(&trunk_list, tr, trunk_softc, tr_entries);
- free(tr, M_DEVBUF, 0);
+ free(tr, M_DEVBUF, sizeof *tr);
splx(s);
@@ -323,8 +322,7 @@ trunk_port_create(struct trunk_softc *tr, struct ifnet *ifp)
if ((error = ifpromisc(ifp, 1)) != 0)
return (error);
- if ((tp = malloc(sizeof(struct trunk_port),
- M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL)
+ if ((tp = malloc(sizeof *tp, M_DEVBUF, M_NOWAIT|M_ZERO)) == NULL)
return (ENOMEM);
/* Check if port is a stacked trunk */
@@ -333,7 +331,7 @@ trunk_port_create(struct trunk_softc *tr, struct ifnet *ifp)
tp->tp_flags |= TRUNK_PORT_STACK;
if (trunk_port_checkstacking(tr_ptr) >=
TRUNK_MAX_STACKING) {
- free(tp, M_DEVBUF, 0);
+ free(tp, M_DEVBUF, sizeof *tp);
return (E2BIG);
}
}
@@ -466,7 +464,7 @@ trunk_port_destroy(struct trunk_port *tp)
/* Reset the port lladdr */
trunk_port_lladdr(tp, tp->tp_lladdr);
- free(tp, M_DEVBUF, 0);
+ free(tp, M_DEVBUF, sizeof *tp);
/* Update trunk capabilities */
tr->tr_capabilities = trunk_capabilities(tr);
@@ -1417,8 +1415,8 @@ int
trunk_lb_detach(struct trunk_softc *tr)
{
struct trunk_lb *lb = (struct trunk_lb *)tr->tr_psc;
- if (lb != NULL)
- free(lb, M_DEVBUF, 0);
+
+ free(lb, M_DEVBUF, sizeof *lb);
return (0);
}
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 8287de18fc0..393fd07e778 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.142 2015/09/13 10:02:36 dlg Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.143 2015/09/29 10:11:40 deraadt Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
@@ -733,7 +733,7 @@ vlan_ether_addmulti(struct ifvlan *ifv, struct ifreq *ifr)
ioctl_failed:
LIST_REMOVE(mc, mc_entries);
- free(mc, M_DEVBUF, 0);
+ free(mc, M_DEVBUF, sizeof *mc);
alloc_failed:
(void)ether_delmulti(ifr, (struct arpcom *)&ifv->ifv_ac);
@@ -774,7 +774,7 @@ vlan_ether_delmulti(struct ifvlan *ifv, struct ifreq *ifr)
if ((error = (*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)ifr)) != 0) {
/* And forget about this address. */
LIST_REMOVE(mc, mc_entries);
- free(mc, M_DEVBUF, 0);
+ free(mc, M_DEVBUF, sizeof *mc);
} else
(void)ether_addmulti(ifr, (struct arpcom *)&ifv->ifv_ac);
return (error);
@@ -803,7 +803,7 @@ vlan_ether_purgemulti(struct ifvlan *ifv)
memcpy(&ifr->ifr_addr, &mc->mc_addr, mc->mc_addr.ss_len);
(void)(*ifp->if_ioctl)(ifp, SIOCDELMULTI, (caddr_t)ifr);
LIST_REMOVE(mc, mc_entries);
- free(mc, M_DEVBUF, 0);
+ free(mc, M_DEVBUF, sizeof *mc);
}
}
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.