diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-11-03 03:08:00 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-11-03 03:08:00 +0000 |
| commit | 5ff140d246573b102762c244776a1297acc30fd9 (patch) | |
| tree | f3c810b3ef2aa7a6a1a9e4e1b7144af036afd96a /sys/kern/sys_generic.c | |
| parent | No need to immediately remove an expired lease from the list of (diff) | |
| download | wireguard-openbsd-5ff140d246573b102762c244776a1297acc30fd9.tar.xz wireguard-openbsd-5ff140d246573b102762c244776a1297acc30fd9.zip | |
pass size argument to free()
ok doug tedu
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 1b09d012d35..f79c61c772e 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_generic.c,v 1.93 2014/10/13 03:21:18 dlg Exp $ */ +/* $OpenBSD: sys_generic.c,v 1.94 2014/11/03 03:08:00 deraadt 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, 0); + free(ktriov, M_TEMP, iovlen); } #endif *retval = cnt; done: if (needfree) - free(needfree, M_IOV, 0); + free(needfree, M_IOV, iovlen); 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, 0); + free(ktriov, M_TEMP, iovlen); } #endif *retval = cnt; done: if (needfree) - free(needfree, M_IOV, 0); + free(needfree, M_IOV, iovlen); 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, 0); + free(memp, M_IOCTLOPS, size); return (error); } @@ -711,7 +711,7 @@ done: } if (pibits[0] != (fd_set *)&bits[0]) - free(pibits[0], M_TEMP, 0); + free(pibits[0], M_TEMP, 6 * ni); return (error); } @@ -1013,7 +1013,7 @@ done: } bad: if (pl != pfds) - free(pl, M_TEMP, 0); + free(pl, M_TEMP, sz); return (error); } |