summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2003-11-19 02:46:04 +0000
committertedu <tedu@openbsd.org>2003-11-19 02:46:04 +0000
commitdc841f1d0233d8cfbb1588577ed1df0a64e5b271 (patch)
tree81632ee1c195ab1e75924c2221e98937f5a97dc0
parent- add ALI M1533 and M1535 ids. ok mickey@ (diff)
downloadwireguard-openbsd-dc841f1d0233d8cfbb1588577ed1df0a64e5b271.tar.xz
wireguard-openbsd-dc841f1d0233d8cfbb1588577ed1df0a64e5b271.zip
MALLOC is not meant for variable size allocations
-rw-r--r--sys/ufs/ufs/ufs_vnops.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 7ed0c02506e..bf8ca11259e 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.50 2003/09/23 16:51:13 millert Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.51 2003/11/19 02:46:04 tedu Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -1573,7 +1573,7 @@ ufs_readdir(v)
auio.uio_iovcnt = 1;
auio.uio_segflg = UIO_SYSSPACE;
aiov.iov_len = count;
- MALLOC(dirbuf, caddr_t, count, M_TEMP, M_WAITOK);
+ dirbuf = malloc(count, M_TEMP, M_WAITOK);
aiov.iov_base = dirbuf;
error = VOP_READ(ap->a_vp, &auio, 0, ap->a_cred);
if (error == 0) {
@@ -1625,8 +1625,7 @@ ufs_readdir(v)
}
lost += uio->uio_offset - off;
uio->uio_offset = off;
- MALLOC(cookies, u_long *, ncookies * sizeof(u_long), M_TEMP,
- M_WAITOK);
+ cookies = malloc(ncookies * sizeof(u_long), M_TEMP, M_WAITOK);
*ap->a_ncookies = ncookies;
*ap->a_cookies = cookies;
for (off = offstart, dp = dpstart; off < uio->uio_offset; ) {