diff options
author | 2015-09-08 10:21:16 +0000 | |
---|---|---|
committer | 2015-09-08 10:21:16 +0000 | |
commit | 931a189fd120d037ea1fa42725b7e6de9196fe1f (patch) | |
tree | bf5389a7e95c931b4d776f747600b047223db6c5 | |
parent | sizes for free(); ok semarie (diff) | |
download | wireguard-openbsd-931a189fd120d037ea1fa42725b7e6de9196fe1f.tar.xz wireguard-openbsd-931a189fd120d037ea1fa42725b7e6de9196fe1f.zip |
sizes for free(); ok semarie
-rw-r--r-- | sys/arch/sparc/dev/cs4231.c | 6 | ||||
-rw-r--r-- | sys/arch/sparc/dev/fd.c | 6 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/intr.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/machdep.c | 4 | ||||
-rw-r--r-- | sys/arch/sparc/sparc/vm_machdep.c | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/sparc/dev/cs4231.c b/sys/arch/sparc/dev/cs4231.c index 097ac404cba..0c02ff2e54d 100644 --- a/sys/arch/sparc/dev/cs4231.c +++ b/sys/arch/sparc/dev/cs4231.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cs4231.c,v 1.34 2015/05/11 06:52:36 ratchov Exp $ */ +/* $OpenBSD: cs4231.c,v 1.35 2015/09/08 10:21:16 deraadt Exp $ */ /* * Copyright (c) 1999 Jason L. Wright (jason@thought.net) @@ -1396,7 +1396,7 @@ cs4231_alloc(addr, direction, size, pool, flags) p->addr_dva = dvma_malloc(size, &p->addr, flags); if (p->addr_dva == NULL) { - free(p, pool, 0); + free(p, pool, sizeof *p); return (NULL); } @@ -1420,7 +1420,7 @@ cs4231_free(addr, ptr, pool) continue; dvma_free(p->addr_dva, p->size, &p->addr); *pp = p->next; - free(p, pool, 0); + free(p, pool, sizeof *p); return; } printf("%s: attempt to free rogue pointer\n", sc->sc_dev.dv_xname); diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c index f47931cb127..d85d96783d7 100644 --- a/sys/arch/sparc/dev/fd.c +++ b/sys/arch/sparc/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.90 2014/07/12 18:44:43 tedu Exp $ */ +/* $OpenBSD: fd.c,v 1.91 2015/09/08 10:21:16 deraadt Exp $ */ /* $NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $ */ /*- @@ -1766,7 +1766,7 @@ fdioctl(dev, cmd, addr, flag, p) lp = malloc(sizeof(*lp), M_TEMP, M_WAITOK); fdgetdisklabel(dev, fd, lp, 0); bcopy(lp, fd->sc_dk.dk_label, sizeof(*lp)); - free(lp, M_TEMP, 0); + free(lp, M_TEMP, sizeof *lp); return 0; case DIOCGPDINFO: @@ -1938,7 +1938,7 @@ fdformat(dev, finfo, p) /* ...and wait for it to complete */ rv = biowait(bp); - free(bp, M_TEMP, 0); + free(bp, M_TEMP, sizeof *bp); return (rv); } diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c index de042ed21c8..06ebed3ae83 100644 --- a/sys/arch/sparc/sparc/intr.c +++ b/sys/arch/sparc/sparc/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.40 2014/11/22 22:48:38 miod Exp $ */ +/* $OpenBSD: intr.c,v 1.41 2015/09/08 10:21:16 deraadt Exp $ */ /* $NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */ /* @@ -419,7 +419,7 @@ softintr_disestablish(void *arg) struct sintrhand *sih = (struct sintrhand *)arg; ih_remove(&sintrhand[sih->sih_ipl], &sih->sih_ih); - free(sih, M_DEVBUF, 0); + free(sih, M_DEVBUF, sizeof *sih); } void * diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c index af4e4b762df..ae26a175dcf 100644 --- a/sys/arch/sparc/sparc/machdep.c +++ b/sys/arch/sparc/sparc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.172 2015/06/02 04:31:53 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.173 2015/09/08 10:21:16 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */ /* @@ -266,7 +266,7 @@ setregs(p, pack, stack, retval) savefpstate(fs); cpuinfo.fpproc = NULL; } - free((void *)fs, M_SUBPROC, 0); + free(fs, M_SUBPROC, sizeof *fs); p->p_md.md_fpstate = NULL; } bzero((caddr_t)tf, sizeof *tf); diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c index e70d8c01878..73395e50b38 100644 --- a/sys/arch/sparc/sparc/vm_machdep.c +++ b/sys/arch/sparc/sparc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.60 2015/05/05 02:13:47 guenther Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.61 2015/09/08 10:21:16 deraadt Exp $ */ /* $NetBSD: vm_machdep.c,v 1.30 1997/03/10 23:55:40 pk Exp $ */ /* @@ -278,7 +278,7 @@ cpu_exit(p) savefpstate(fs); cpuinfo.fpproc = NULL; } - free((void *)fs, M_SUBPROC, 0); + free(fs, M_SUBPROC, sizeof *fs); } pmap_deactivate(p); |