fairly simple sizes for free(); ok tedu

14 files changed, 40 insertions, 40 deletions

diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index f4338e2ad88..f451f9ef782 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpi.c,v 1.292 2015/08/20 20:50:10 kettenis Exp $ */
+/* $OpenBSD: acpi.c,v 1.293 2015/08/28 00:03:53 deraadt Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -645,13 +645,13 @@ acpi_getpci(struct aml_node *node, void *arg)
 
 	/* Check if PCI device exists */
 	if (pci->dev > 0x1F || pci->fun > 7) {
-		free(pci, M_DEVBUF, 0);
+		free(pci, M_DEVBUF, sizeof(*pci));
 		return (1);
 	}
 	tag = pci_make_tag(pc, pci->bus, pci->dev, pci->fun);
 	reg = pci_conf_read(pc, tag, PCI_ID_REG);
 	if (PCI_VENDOR(reg) == PCI_VENDOR_INVALID) {
-		free(pci, M_DEVBUF, 0);
+		free(pci, M_DEVBUF, sizeof(*pci));
 		return (1);
 	}
 	node->pci = pci;
@@ -1555,7 +1555,7 @@ acpi_dotask(struct acpi_softc *sc)
 
 	wq->handler(wq->arg0, wq->arg1);
 
-	free(wq, M_DEVBUF, 0);
+	free(wq, M_DEVBUF, sizeof(*wq));
 
 	/* We did something */
 	return (1);	
@@ -2033,7 +2033,7 @@ acpi_foundprw(struct aml_node *node, void *arg)
 	wq->q_wakepkg = malloc(sizeof(struct aml_value), M_DEVBUF,
 	    M_NOWAIT | M_ZERO);
 	if (wq->q_wakepkg == NULL) {
-		free(wq, M_DEVBUF, 0);
+		free(wq, M_DEVBUF, sizeof(*wq));
 		return 0;
 	}
 	dnprintf(10, "Found _PRW (%s)\n", node->parent->name);
@@ -2544,7 +2544,7 @@ acpi_thread(void *arg)
 		while(acpi_dotask(acpi_softc))
 			;
 	}
-	free(thread, M_DEVBUF, 0);
+	free(thread, M_DEVBUF, sizeof(*thread));
 
 	kthread_exit(0);
 }
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index bd1e83b35bd..bb825a90420 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.124 2015/05/15 10:54:26 dlg Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.125 2015/08/28 00:03:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -214,7 +214,7 @@ atascsi_detach(struct atascsi *as, int flags)
 		return (rv);
 
 	free(as->as_host_ports, M_DEVBUF, 0);
-	free(as, M_DEVBUF, 0);
+	free(as, M_DEVBUF, sizeof(*as));
 
 	return (0);
 }
@@ -434,7 +434,7 @@ atascsi_probe(struct scsi_link *link)
 
 	return (0);
 error:
-	free(ap, M_DEVBUF, 0);
+	free(ap, M_DEVBUF, sizeof(*ap));
 unsupported:
 
 	as->as_methods->ata_free(as->as_cookie, port, link->lun);
@@ -461,7 +461,7 @@ atascsi_free(struct scsi_link *link)
 		return;
 
 	ap = ahp->ahp_ports[link->lun];
-	free(ap, M_DEVBUF, 0);
+	free(ap, M_DEVBUF, sizeof(*ap));
 	ahp->ahp_ports[link->lun] = NULL;
 
 	as->as_methods->ata_free(as->as_cookie, port, link->lun);
@@ -471,7 +471,7 @@ atascsi_free(struct scsi_link *link)
 		 * free ahp itself.  this relies on the order luns are
 		 * detached in scsi_detach_target().
 		 */
-		free(ahp, M_DEVBUF, 0);
+		free(ahp, M_DEVBUF, sizeof(*ap));
 		as->as_host_ports[port] = NULL;
 	}
 }
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 97ed93150b1..5af8aed42f3 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus.c,v 1.50 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: cardbus.c,v 1.51 2015/08/28 00:03:53 deraadt Exp $	*/
 /*	$NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $	*/
 
 /*
@@ -237,7 +237,7 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, pcireg_t cis_ptr,
 		out:
 			while ((p = SIMPLEQ_FIRST(&rom_image)) != NULL) {
 				SIMPLEQ_REMOVE_HEAD(&rom_image, next);
-				free(p, M_DEVBUF, 0);
+				free(p, M_DEVBUF, sizeof(*p));
 			}
 			exrom = pci_conf_read(pc, tag, reg);
 			pci_conf_write(pc, tag, reg, exrom & ~1);
@@ -532,7 +532,7 @@ cardbus_attach_card(struct cardbus_softc *sc)
 			/* do not match */
 			disable_function(sc, function);
 			sc->sc_funcs[function] = NULL;
-			free(ct, M_DEVBUF, 0);
+			free(ct, M_DEVBUF, sizeof(struct cardbus_devfunc));
 		} else {
 			/* found */
 			ct->ct_device = csc;
@@ -544,7 +544,7 @@ cardbus_attach_card(struct cardbus_softc *sc)
 	 * if no functions were attached).
 	 */
 	disable_function(sc, 8);
-	free(tuple, M_TEMP, 0);
+	free(tuple, M_TEMP, 2048);
 
 	return (no_work_funcs);
 }
@@ -617,7 +617,7 @@ cardbus_detach_card(struct cardbus_softc *sc)
 		} else {
 			sc->sc_poweron_func &= ~(1 << ct->ct_func);
 			sc->sc_funcs[ct->ct_func] = NULL;
-			free(ct, M_DEVBUF, 0);
+			free(ct, M_DEVBUF, sizeof(struct cardbus_devfunc));
 		}
 	}
 
diff --git a/sys/dev/cardbus/cardbus_exrom.c b/sys/dev/cardbus/cardbus_exrom.c
index ee1b27ea952..607ad6244e3 100644
--- a/sys/dev/cardbus/cardbus_exrom.c
+++ b/sys/dev/cardbus/cardbus_exrom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus_exrom.c,v 1.6 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: cardbus_exrom.c,v 1.7 2015/08/28 00:03:53 deraadt Exp $	*/
 /*	$NetBSD: cardbus_exrom.c,v 1.4 2000/02/03 06:47:31 thorpej Exp $	*/
 
 /*
@@ -139,7 +139,7 @@ cardbus_read_exrom(bus_space_tag_t romt, bus_space_handle_t romh,
 		if (bus_space_subregion(romt, romh, addr,
 		    image_size, &image->romh)) {
 			DPRINTF(("%s: bus_space_subregion failed", __func__));
-			free(image, M_DEVBUF, 0);
+			free(image, M_DEVBUF, sizeof(*image));
 			return (1);
 		}
 		SIMPLEQ_INSERT_TAIL(head, image, next);
diff --git a/sys/dev/ic/ac97.c b/sys/dev/ic/ac97.c
index c3429f50f97..7c0bc2dbee7 100644
--- a/sys/dev/ic/ac97.c
+++ b/sys/dev/ic/ac97.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ac97.c,v 1.80 2015/05/11 06:46:21 ratchov Exp $	*/
+/*	$OpenBSD: ac97.c,v 1.81 2015/08/28 00:03:53 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Constantine Sapuntzakis
@@ -815,7 +815,7 @@ ac97_attach(struct ac97_host_if *host_if)
 	as->host_if = host_if;
 
 	if ((error = host_if->attach(host_if->arg, &as->codec_if))) {
-		free(as, M_DEVBUF, 0);
+		free(as, M_DEVBUF, sizeof(*as));
 		return (error);
 	}
 
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c
index 1b5b031d7f1..310c0d067c5 100644
--- a/sys/dev/ic/qla.c
+++ b/sys/dev/ic/qla.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qla.c,v 1.51 2015/06/19 11:12:24 jmatthew Exp $ */
+/*	$OpenBSD: qla.c,v 1.52 2015/08/28 00:03:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -2516,7 +2516,7 @@ free:
 destroy:
 	bus_dmamap_destroy(sc->sc_dmat, m->qdm_map);
 qdmfree:
-	free(m, M_DEVBUF, 0);
+	free(m, M_DEVBUF, sizeof(*m));
 
 	return (NULL);
 }
@@ -2528,7 +2528,7 @@ qla_dmamem_free(struct qla_softc *sc, struct qla_dmamem *m)
 	bus_dmamem_unmap(sc->sc_dmat, m->qdm_kva, m->qdm_size);
 	bus_dmamem_free(sc->sc_dmat, &m->qdm_seg, 1);
 	bus_dmamap_destroy(sc->sc_dmat, m->qdm_map);
-	free(m, M_DEVBUF, 0);
+	free(m, M_DEVBUF, sizeof(*m));
 }
 
 int
diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c
index 22f039fb128..54fea1d378d 100644
--- a/sys/dev/ic/qlw.c
+++ b/sys/dev/ic/qlw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlw.c,v 1.28 2015/03/14 03:38:47 jsg Exp $ */
+/*	$OpenBSD: qlw.c,v 1.29 2015/08/28 00:03:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -1672,7 +1672,7 @@ free:
 destroy:
 	bus_dmamap_destroy(sc->sc_dmat, m->qdm_map);
 qdmfree:
-	free(m, M_DEVBUF, 0);
+	free(m, M_DEVBUF, sizeof(*m));
 
 	return (NULL);
 }
@@ -1684,7 +1684,7 @@ qlw_dmamem_free(struct qlw_softc *sc, struct qlw_dmamem *m)
 	bus_dmamem_unmap(sc->sc_dmat, m->qdm_kva, m->qdm_size);
 	bus_dmamem_free(sc->sc_dmat, &m->qdm_seg, 1);
 	bus_dmamap_destroy(sc->sc_dmat, m->qdm_map);
-	free(m, M_DEVBUF, 0);
+	free(m, M_DEVBUF, sizeof(*m));
 }
 
 int
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index df8d25146dc..fdc08058fd5 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc.c,v 1.129 2015/08/17 15:36:29 krw Exp $	*/
+/*	$OpenBSD: wdc.c,v 1.130 2015/08/28 00:03:53 deraadt Exp $	*/
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -731,7 +731,7 @@ wdc_alloc_queue(void)
 void
 wdc_free_queue(struct channel_queue *queue)
 {
-	free(queue, M_DEVBUF, 0);
+	free(queue, M_DEVBUF, sizeof(*queue));
 }
 
 void
diff --git a/sys/dev/pci/if_rtwn.c b/sys/dev/pci/if_rtwn.c
index 9b669293760..1d772a58eba 100644
--- a/sys/dev/pci/if_rtwn.c
+++ b/sys/dev/pci/if_rtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $	*/
+/*	$OpenBSD: if_rtwn.c,v 1.6 2015/08/28 00:03:53 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -2311,7 +2311,7 @@ rtwn_load_firmware(struct rtwn_softc *sc)
 		goto fail;
 	}
  fail:
-	free(fw, M_DEVBUF, 0);
+	free(fw, M_DEVBUF, len);
 	return (error);
 }
 
diff --git a/sys/dev/pci/if_tht.c b/sys/dev/pci/if_tht.c
index e4f5c9d051d..84a67976d0e 100644
--- a/sys/dev/pci/if_tht.c
+++ b/sys/dev/pci/if_tht.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tht.c,v 1.132 2015/06/24 09:40:54 mpi Exp $ */
+/*	$OpenBSD: if_tht.c,v 1.133 2015/08/28 00:03:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -1717,7 +1717,7 @@ tht_fw_load(struct tht_softc *sc)
 	tht_write(sc, THT_REG_INIT_SEMAPHORE, 0x1);
 
 err:
-	free(fw, M_DEVBUF, 0);
+	free(fw, M_DEVBUF, fwlen);
 	return (error);
 }
 
diff --git a/sys/dev/wscons/wsemul_dumb.c b/sys/dev/wscons/wsemul_dumb.c
index 9c5ed2a316d..32224025b84 100644
--- a/sys/dev/wscons/wsemul_dumb.c
+++ b/sys/dev/wscons/wsemul_dumb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_dumb.c,v 1.12 2014/07/12 18:48:53 tedu Exp $ */
+/* $OpenBSD: wsemul_dumb.c,v 1.13 2015/08/28 00:03:53 deraadt Exp $ */
 /* $NetBSD: wsemul_dumb.c,v 1.7 2000/01/05 11:19:36 drochner Exp $ */
 
 /*
@@ -299,7 +299,7 @@ wsemul_dumb_detach(void *cookie, u_int *crowp, u_int *ccolp)
 	*crowp = edp->crow;
 	*ccolp = edp->ccol;
 	if (edp != &wsemul_dumb_console_emuldata)
-		free(edp, M_DEVBUF, 0);
+		free(edp, M_DEVBUF, sizeof *edp);
 }
 
 void
diff --git a/sys/dev/wscons/wsemul_sun.c b/sys/dev/wscons/wsemul_sun.c
index 6d79675a332..4d2f02d046a 100644
--- a/sys/dev/wscons/wsemul_sun.c
+++ b/sys/dev/wscons/wsemul_sun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_sun.c,v 1.31 2014/07/12 18:48:53 tedu Exp $ */
+/* $OpenBSD: wsemul_sun.c,v 1.32 2015/08/28 00:03:53 deraadt Exp $ */
 /* $NetBSD: wsemul_sun.c,v 1.11 2000/01/05 11:19:36 drochner Exp $ */
 
 /*
@@ -1062,7 +1062,7 @@ wsemul_sun_detach(void *cookie, u_int *crowp, u_int *ccolp)
 	*crowp = edp->crow;
 	*ccolp = edp->ccol;
 	if (edp != &wsemul_sun_console_emuldata)
-		free(edp, M_DEVBUF, 0);
+		free(edp, M_DEVBUF, sizeof *edp);
 }
 
 void
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index ab1df8d4e43..7f7d2e90b6c 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsemul_vt100.c,v 1.32 2014/07/12 18:48:53 tedu Exp $ */
+/* $OpenBSD: wsemul_vt100.c,v 1.33 2015/08/28 00:03:53 deraadt Exp $ */
 /* $NetBSD: wsemul_vt100.c,v 1.13 2000/04/28 21:56:16 mycroft Exp $ */
 
 /*
@@ -248,7 +248,7 @@ wsemul_vt100_detach(void *cookie, u_int *crowp, u_int *ccolp)
 	f(edp->nrctab)
 #undef f
 	if (edp != &wsemul_vt100_console_emuldata)
-		free(edp, M_DEVBUF, 0);
+		free(edp, M_DEVBUF, sizeof *edp);
 }
 
 void
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index 2014121b3b1..c1a3f978fac 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wsmux.c,v 1.29 2015/03/14 03:38:50 jsg Exp $	*/
+/*	$OpenBSD: wsmux.c,v 1.30 2015/08/28 00:03:53 deraadt Exp $	*/
 /*      $NetBSD: wsmux.c,v 1.37 2005/04/30 03:47:12 augustss Exp $      */
 
 /*
@@ -145,7 +145,7 @@ wsmux_getmux(int n)
 		wsmuxdevs = new;
 		nwsmux = n + 1;
 		if (old != NULL)
-			free(old, M_DEVBUF, 0);
+			free(old, M_DEVBUF, nwsmux * sizeof(*wsmuxdevs));
 	}
 
 	sc = wsmuxdevs[n];