Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6-1]: src/sys/compat Pull up following revision(s) (requested by ...
details: https://anonhg.NetBSD.org/src/rev/e1b9ada805ae
branches: netbsd-6-1
changeset: 776221:e1b9ada805ae
user: snj <snj%NetBSD.org@localhost>
date: Sat Aug 12 16:22:30 2017 +0000
description:
Pull up following revision(s) (requested by mrg in ticket #1469):
sys/compat/common/vfs_syscalls_12.c: revision 1.30
sys/compat/common/vfs_syscalls_43.c: revision 1.56
sys/compat/sys/dirent.h: revision 1.3
It is wishful thinking that vn_readdir will return dirent12 structures.
--
Fix the compat-4.3 getdirentries call (pre d_type). This is used in NetBSD-0.9.
--
add a struct for the 4.3BSD struct direct
diffstat:
sys/compat/common/vfs_syscalls_12.c | 137 ++++++++++++++++++++++--
sys/compat/common/vfs_syscalls_43.c | 204 ++++++++++++++++++++---------------
sys/compat/sys/dirent.h | 9 +-
3 files changed, 249 insertions(+), 101 deletions(-)
diffs (truncated from 452 to 300 lines):
diff -r 247774dca6fe -r e1b9ada805ae sys/compat/common/vfs_syscalls_12.c
--- a/sys/compat/common/vfs_syscalls_12.c Thu Aug 10 06:48:23 2017 +0000
+++ b/sys/compat/common/vfs_syscalls_12.c Sat Aug 12 16:22:30 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_12.c,v 1.29 2011/01/19 10:21:16 tsutsui Exp $ */
+/* $NetBSD: vfs_syscalls_12.c,v 1.29.26.1 2017/08/12 16:22:30 snj Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.29 2011/01/19 10:21:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_12.c,v 1.29.26.1 2017/08/12 16:22:30 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,6 +56,7 @@
#include <sys/syscallargs.h>
#include <compat/sys/stat.h>
+#include <compat/sys/dirent.h>
/*
* Convert from a new to an old stat structure.
@@ -96,28 +97,140 @@
syscallarg(u_int) count;
syscallarg(long *) basep;
} */
+ struct dirent *bdp;
+ struct vnode *vp;
+ char *inp, *tbuf; /* Current-format */
+ int len, reclen; /* Current-format */
+ char *outp; /* Dirent12-format */
+ int resid, old_reclen = 0; /* Dirent12-format */
struct file *fp;
- int error, done;
+ struct uio auio;
+ struct iovec aiov;
+ struct dirent12 idb;
+ off_t off; /* true file offset */
+ int buflen, error, eofflag, nbytes;
+ struct vattr va;
+ off_t *cookiebuf = NULL, *cookie;
+ int ncookies;
long loff;
-
+
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
- return error;
+ return (error);
+
if ((fp->f_flag & FREAD) == 0) {
error = EBADF;
- goto out;
+ goto out1;
}
+ vp = (struct vnode *)fp->f_data;
+ if (vp->v_type != VDIR) {
+ error = ENOTDIR;
+ goto out1;
+ }
+
+ vn_lock(vp, LK_SHARED | LK_RETRY);
+ error = VOP_GETATTR(vp, &va, l->l_cred);
+ VOP_UNLOCK(vp);
+ if (error)
+ goto out1;
+
loff = fp->f_offset;
+ nbytes = SCARG(uap, count);
+ buflen = min(MAXBSIZE, nbytes);
+ if (buflen < va.va_blocksize)
+ buflen = va.va_blocksize;
+ tbuf = malloc(buflen, M_TEMP, M_WAITOK);
- error = vn_readdir(fp, SCARG(uap, buf), UIO_USERSPACE,
- SCARG(uap, count), &done, l, 0, 0);
+ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ off = fp->f_offset;
+again:
+ aiov.iov_base = tbuf;
+ aiov.iov_len = buflen;
+ auio.uio_iov = &aiov;
+ auio.uio_iovcnt = 1;
+ auio.uio_rw = UIO_READ;
+ auio.uio_resid = buflen;
+ auio.uio_offset = off;
+ UIO_SETUP_SYSSPACE(&auio);
+ /*
+ * First we read into the malloc'ed buffer, then
+ * we massage it into user space, one record at a time.
+ */
+ error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &cookiebuf,
+ &ncookies);
+ if (error)
+ goto out;
+
+ inp = tbuf;
+ outp = SCARG(uap, buf);
+ resid = nbytes;
+ if ((len = buflen - auio.uio_resid) == 0)
+ goto eof;
- error = copyout(&loff, SCARG(uap, basep), sizeof(long));
- *retval = done;
- out:
+ for (cookie = cookiebuf; len > 0; len -= reclen) {
+ bdp = (struct dirent *)inp;
+ reclen = bdp->d_reclen;
+ if (reclen & 3)
+ panic(__func__);
+ if (bdp->d_fileno == 0) {
+ inp += reclen; /* it is a hole; squish it out */
+ if (cookie)
+ off = *cookie++;
+ else
+ off += reclen;
+ continue;
+ }
+ old_reclen = _DIRENT_RECLEN(&idb, bdp->d_namlen);
+ if (reclen > len || resid < old_reclen) {
+ /* entry too big for buffer, so just stop */
+ outp++;
+ break;
+ }
+ /*
+ * Massage in place to make a Dirent12-shaped dirent (otherwise
+ * we have to worry about touching user memory outside of
+ * the copyout() call).
+ */
+ idb.d_fileno = (uint32_t)bdp->d_fileno;
+ idb.d_reclen = (uint16_t)old_reclen;
+ idb.d_type = (uint8_t)bdp->d_type;
+ idb.d_namlen = (uint8_t)bdp->d_namlen;
+ strcpy(idb.d_name, bdp->d_name);
+ if ((error = copyout(&idb, outp, old_reclen)))
+ goto out;
+ /* advance past this real entry */
+ inp += reclen;
+ if (cookie)
+ off = *cookie++; /* each entry points to itself */
+ else
+ off += reclen;
+ /* advance output past Dirent12-shaped entry */
+ outp += old_reclen;
+ resid -= old_reclen;
+ }
+
+ /* if we squished out the whole block, try again */
+ if (outp == SCARG(uap, buf)) {
+ if (cookiebuf)
+ free(cookiebuf, M_TEMP);
+ cookiebuf = NULL;
+ goto again;
+ }
+ fp->f_offset = off; /* update the vnode offset */
+
+eof:
+ *retval = nbytes - resid;
+out:
+ VOP_UNLOCK(vp);
+ if (cookiebuf)
+ free(cookiebuf, M_TEMP);
+ free(tbuf, M_TEMP);
+out1:
fd_putfile(SCARG(uap, fd));
- return error;
+ if (error)
+ return error;
+ return copyout(&loff, SCARG(uap, basep), sizeof(long));
}
/*
diff -r 247774dca6fe -r e1b9ada805ae sys/compat/common/vfs_syscalls_43.c
--- a/sys/compat/common/vfs_syscalls_43.c Thu Aug 10 06:48:23 2017 +0000
+++ b/sys/compat/common/vfs_syscalls_43.c Sat Aug 12 16:22:30 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_43.c,v 1.54.14.1.2.1 2016/08/27 14:52:25 bouyer Exp $ */
+/* $NetBSD: vfs_syscalls_43.c,v 1.54.14.1.2.2 2017/08/12 16:22:30 snj Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.54.14.1.2.1 2016/08/27 14:52:25 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_43.c,v 1.54.14.1.2.2 2017/08/12 16:22:30 snj Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -70,6 +70,7 @@
#include <compat/sys/stat.h>
#include <compat/sys/mount.h>
+#include <compat/sys/dirent.h>
#include <compat/common/compat_util.h>
#include <compat/common/compat_mod.h>
@@ -375,112 +376,139 @@
syscallarg(u_int) count;
syscallarg(long *) basep;
} */
+ struct dirent *bdp;
struct vnode *vp;
+ char *inp, *tbuf; /* Current-format */
+ int len, reclen; /* Current-format */
+ char *outp; /* Dirent12-format */
+ int resid, old_reclen = 0; /* Dirent12-format */
struct file *fp;
- struct uio auio, kuio;
- struct iovec aiov, kiov;
- struct dirent *dp, *edp;
- char *dirbuf;
- size_t count = min(MAXBSIZE, (size_t)SCARG(uap, count));
-
- int error, eofflag, readcnt;
+ struct uio auio;
+ struct iovec aiov;
+ struct dirent43 idb;
+ off_t off; /* true file offset */
+ int buflen, error, eofflag, nbytes;
+ struct vattr va;
+ off_t *cookiebuf = NULL, *cookie;
+ int ncookies;
long loff;
-
+
/* fd_getvnode() will use the descriptor for us */
if ((error = fd_getvnode(SCARG(uap, fd), &fp)) != 0)
return (error);
+
if ((fp->f_flag & FREAD) == 0) {
error = EBADF;
- goto out;
+ goto out1;
}
+
vp = (struct vnode *)fp->f_data;
-unionread:
if (vp->v_type != VDIR) {
- error = EINVAL;
- goto out;
+ error = ENOTDIR;
+ goto out1;
}
- aiov.iov_base = SCARG(uap, buf);
- aiov.iov_len = count;
+
+ vn_lock(vp, LK_SHARED | LK_RETRY);
+ error = VOP_GETATTR(vp, &va, l->l_cred);
+ VOP_UNLOCK(vp);
+ if (error)
+ goto out1;
+
+ loff = fp->f_offset;
+ nbytes = SCARG(uap, count);
+ buflen = min(MAXBSIZE, nbytes);
+ if (buflen < va.va_blocksize)
+ buflen = va.va_blocksize;
+ tbuf = malloc(buflen, M_TEMP, M_WAITOK);
+
+ vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ off = fp->f_offset;
+again:
+ aiov.iov_base = tbuf;
+ aiov.iov_len = buflen;
auio.uio_iov = &aiov;
auio.uio_iovcnt = 1;
auio.uio_rw = UIO_READ;
- auio.uio_resid = count;
- KASSERT(l == curlwp);
- auio.uio_vmspace = curproc->p_vmspace;
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
- loff = auio.uio_offset = fp->f_offset;
-# if (BYTE_ORDER != LITTLE_ENDIAN)
- if ((vp->v_mount->mnt_iflag & IMNT_DTYPE) == 0) {
- error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag,
- (off_t **)0, (int *)0);
- fp->f_offset = auio.uio_offset;
- } else
-# endif
- {
- kuio = auio;
- kuio.uio_iov = &kiov;
- kiov.iov_len = count;
- dirbuf = malloc(count, M_TEMP, M_WAITOK);
- kiov.iov_base = dirbuf;
- UIO_SETUP_SYSSPACE(&kuio);
- error = VOP_READDIR(vp, &kuio, fp->f_cred, &eofflag,
- (off_t **)0, (int *)0);
- fp->f_offset = kuio.uio_offset;
- if (error == 0) {
- readcnt = count - kuio.uio_resid;
- edp = (struct dirent *)&dirbuf[readcnt];
- for (dp = (struct dirent *)dirbuf; dp < edp; ) {
Home |
Main Index |
Thread Index |
Old Index