 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptyfs.h,v 1.7 2008/06/28 01:34:05 rumble Exp $	*/
+/*	$NetBSD: ptyfs.h,v 1.8 2009/03/15 16:43:55 christos Exp $	*/
 /*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -98,39 +98,46 @@ struct ptyfsnode {
 #define	PTYFS_MODIFY	2
 #define	PTYFS_CHANGE	4
 	/* Attribute information */
 	uid_t		ptyfs_uid;
 	gid_t		ptyfs_gid;
 	mode_t		ptyfs_mode;
 	int		ptyfs_flags;
 	struct timespec	ptyfs_ctime, ptyfs_mtime, ptyfs_atime, ptyfs_birthtime;
 };
 struct ptyfsmount {
 	gid_t pmnt_gid;
 	mode_t pmnt_mode;
 	int pmnt_flags;
 };
 #define VFSTOPTY(mp)	((struct ptyfsmount *)(mp)->mnt_data)
 #endif /* _KERNEL */
 struct ptyfs_args {
 	int version;
 	gid_t gid;
 	mode_t mode;
 	int flags;
 };
-#define PTYFS_ARGSVERSION	1
+#define PTYFS_ARGSVERSION	2
 #define PTYFSMNT_CHROOT		0x01
 #define PTYFSMNT_BITS "\177\20" \
     "b\00chroot\0"
 /*
  * Kernel stuff follows
  */
 #ifdef _KERNEL
 #define UIO_MX 32
 #define PTYFS_FILENO(pty, type) \
     ((type == PTYFSroot) ? 2 : \
      ((((pty) + 1) * 2 + (((type) == PTYFSpts) ? 1 : 2))))
 #define PTYFS_MAKEDEV(ptyfs) \

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ptyfs_vfsops.c,v 1.38 2009/01/11 02:45:51 christos Exp $	*/
+/*	$NetBSD: ptyfs_vfsops.c,v 1.39 2009/03/15 16:43:55 christos Exp $	*/
 /*
  * Copyright (c) 1992, 1993, 1995
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software donated to Berkeley by
  * Jan-Simon Pendry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -28,27 +28,27 @@
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 /*
  * Pseudo-tty Filesystem
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.38 2009/01/11 02:45:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.39 2009/03/15 16:43:55 christos Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/dirent.h>
 #include <sys/malloc.h>
 #include <sys/syslog.h>
 @@ -81,41 +81,73 @@ static void ptyfs__getvattr(struct ptm_p
 /*
  * ptm glue: When we mount, we make ptm point to us.
  */
 struct ptm_pty *ptyfs_save_ptm;
 static int ptyfs_count;
 struct ptm_pty ptm_ptyfspty = {
 	ptyfs__allocvp,
 	ptyfs__makename,
 	ptyfs__getvattr,
 	NULL
 };
 static const char *
 ptyfs__getpath(struct lwp *l, const struct mount *mp)
+{
 #define MAXBUF (sizeof(mp->mnt_stat.f_mntonname) + 32)
 	struct cwdinfo *cwdi = l->l_proc->p_cwdi;
 	char *buf;
 	const char *rv;
 	size_t len;
 	char *bp;
 	int error;
 	struct ptyfsmount *pmnt = mp->mnt_data;
 	rv = mp->mnt_stat.f_mntonname;
 	if (cwdi->cwdi_rdir == NULL ||
 	    (pmnt->pmnt_flags & PTYFSMNT_CHROOT) == 0)
 		return rv;
 	buf = malloc(MAXBUF, M_TEMP, M_WAITOK);
 	bp = buf + MAXBUF;
 	*--bp = '\0';
 	error = getcwd_common(cwdi->cwdi_rdir, rootvnode, &bp,
 	    buf, MAXBUF / 2, 0, l);
 	if (error)	/* XXX */
 		goto out;
 	len = strlen(bp);
 	if (len < sizeof(mp->mnt_stat.f_mntonname))	/* XXX */
 		rv += len;
 out:
 	free(buf, M_TEMP);
 	return rv;
+}
 static int
 ptyfs__makename(struct ptm_pty *pt, struct lwp *l, char *tbuf, size_t bufsiz,
     dev_t dev, char ms)
+{
 	struct mount *mp = pt->arg;
 	size_t len;
 	switch (ms) {
 	case 'p':
 		/* We don't provide access to the master, should we? */
 		len = snprintf(tbuf, bufsiz, "/dev/null");
 		break;
 	case 't':
-		len = snprintf(tbuf, bufsiz, "%s/%llu",
+		len = snprintf(tbuf, bufsiz, "%s/%llu", ptyfs__getpath(l, mp),
 		    mp->mnt_stat.f_mntonname,
 		    (unsigned long long)minor(dev));
 		break;
 	default:
 		return EINVAL;
+	}
 	return len >= bufsiz ? ENOSPC : 0;
+}
 static int
 /*ARGSUSED*/
 ptyfs__allocvp(struct ptm_pty *pt, struct lwp *l, struct vnode **vpp,
 @@ -189,48 +221,57 @@ ptyfs_mount(struct mount *mp, const char
 	if (*data_len < sizeof *args)
 		return EINVAL;
 	if (UIO_MX & (UIO_MX - 1)) {
 		log(LOG_ERR, "ptyfs: invalid directory entry size");
 		return EINVAL;
+	}
 	if (mp->mnt_flag & MNT_GETARGS) {
 		pmnt = VFSTOPTY(mp);
 		if (pmnt == NULL)
 			return EIO;
 		args->version = PTYFS_ARGSVERSION;
 		args->mode = pmnt->pmnt_mode;
 		args->gid = pmnt->pmnt_gid;
-		*data_len = sizeof *args;
+		if (args->version >= PTYFS_ARGSVERSION) {
 			args->flags = pmnt->pmnt_flags;
 			*data_len = sizeof *args;
 		} else {
 			*data_len =
 			    sizeof(struct { int f; gid_t g; mode_t m; });
+		}
 		return 0;
+	}
 	/* Don't allow more than one mount */
 	if (ptyfs_count)
 		return EBUSY;
 	if (mp->mnt_flag & MNT_UPDATE)
 		return EOPNOTSUPP;
 	if (args->version != PTYFS_ARGSVERSION)
 		return EINVAL;
 	pmnt = malloc(sizeof(struct ptyfsmount), M_PTYFSMNT, M_WAITOK);
 	mp->mnt_data = pmnt;
 	pmnt->pmnt_gid = args->gid;
 	pmnt->pmnt_mode = args->mode;
 	if (args->version >= PTYFS_ARGSVERSION)
 		pmnt->pmnt_flags = args->flags;
 	else
 		pmnt->pmnt_flags = 0;
 	mp->mnt_flag |= MNT_LOCAL;
 	vfs_getnewfsid(mp);
 	if ((error = set_statvfs_info(path, UIO_USERSPACE, "ptyfs",
 	    UIO_SYSSPACE, mp->mnt_op->vfs_name, mp, l)) != 0) {
 		free(pmnt, M_PTYFSMNT);
 		return error;
+	}
 	/* Point pty access to us */
 	ptm_ptyfspty.arg = mp;
 	ptyfs_save_ptm = pty_sethandler(&ptm_ptyfspty);