Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove logic to compute relative pathes to chroots. It breaks the

Browse Source 
default case of ptyfs mounted under /dev/pts as any chroot would get
/%d as slave names. This allows null mounts of ptyfs to work.
To allow pty allocation from within chroots, either no ptyfs must be
mounted or a null mount exist.
This commit is contained in:
joerg 2008-10-26 23:06:41 +00:00
parent 1b69e667f6
commit f1481725b6
1 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/fs/ptyfs/ptyfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptyfs_vfsops.c,v 1.36 2008/06/28 01:34:05 rumble Exp $ */
/* $NetBSD: ptyfs_vfsops.c,v 1.37 2008/10/26 23:06:41 joerg Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.36 2008/06/28 01:34:05 rumble Exp $");
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.37 2008/10/26 23:06:41 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -91,37 +91,6 @@ struct ptm_pty ptm_ptyfspty = {
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;
rv = mp->mnt_stat.f_mntonname;
if (cwdi->cwdi_rdir == NULL)
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)
@ -135,7 +104,7 @@ ptyfs__makename(struct ptm_pty *pt, struct lwp *l, char *tbuf, size_t bufsiz,
len = snprintf(tbuf, bufsiz, "/dev/null");
break;
case 't':
len = snprintf(tbuf, bufsiz, "%s/%d", ptyfs__getpath(l, mp),
len = snprintf(tbuf, bufsiz, "%s/%d", mp->mnt_stat.f_mntonname,
minor(dev));
break;
default: