diff options
| author |   tedu <tedu@openbsd.org> | 2014-07-12 18:43:32 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-07-12 18:43:32 +0000 |
| commit | 9e8577e7fffeab9111fc01d9e1c7ca42905be86a (patch) | |
| tree | c47f9922e2223e66aa9394467812c88df740cff4 /sys/kern/sys_generic.c | |
| parent | Remove extra parenthesis. (diff) | |
| download | wireguard-openbsd-9e8577e7fffeab9111fc01d9e1c7ca42905be86a.tar.xz wireguard-openbsd-9e8577e7fffeab9111fc01d9e1c7ca42905be86a.zip | |
add a size argument to free. will be used soon, but for now default to 0.
after discussions with beck deraadt kettenis.
Diffstat (limited to 'sys/kern/sys_generic.c')
| -rw-r--r-- | sys/kern/sys_generic.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 837d95f8182..b94b7dd4f8f 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_generic.c,v 1.88 2014/07/08 17:42:50 miod Exp $ */ +/* $OpenBSD: sys_generic.c,v 1.89 2014/07/12 18:43:32 tedu Exp $ */ /* $NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $ */ /* @@ -212,13 +212,13 @@ dofilereadv(struct proc *p, int fd, struct file *fp, const struct iovec *iovp, if (ktriov != NULL) { if (error == 0) ktrgenio(p, fd, UIO_READ, ktriov, cnt); - free(ktriov, M_TEMP); + free(ktriov, M_TEMP, 0); } #endif *retval = cnt; done: if (needfree) - free(needfree, M_IOV); + free(needfree, M_IOV, 0); out: FRELE(fp, p); return (error); @@ -368,13 +368,13 @@ dofilewritev(struct proc *p, int fd, struct file *fp, const struct iovec *iovp, if (ktriov != NULL) { if (error == 0) ktrgenio(p, fd, UIO_WRITE, ktriov, cnt); - free(ktriov, M_TEMP); + free(ktriov, M_TEMP, 0); } #endif *retval = cnt; done: if (needfree) - free(needfree, M_IOV); + free(needfree, M_IOV, 0); out: FRELE(fp, p); return (error); @@ -518,7 +518,7 @@ sys_ioctl(struct proc *p, void *v, register_t *retval) out: FRELE(fp, p); if (memp) - free(memp, M_IOCTLOPS); + free(memp, M_IOCTLOPS, 0); return (error); } @@ -714,7 +714,7 @@ done: } if (pibits[0] != (fd_set *)&bits[0]) - free(pibits[0], M_TEMP); + free(pibits[0], M_TEMP, 0); return (error); } @@ -1015,7 +1015,7 @@ done: } bad: if (pl != pfds) - free(pl, M_TEMP); + free(pl, M_TEMP, 0); return (error); } |