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

wait(2): Put the status in retval[1] as solaris expects it there 

avoid infinite loop when looking for / [since it used to return /emul/svr4],
by returning the real root.
This commit is contained in:
christos 1995-01-22 23:44:48 +00:00
parent 01ce8db055
commit 279d6f3237
2 changed files with 66 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/compat/svr4/svr4_misc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_misc.c,v 1.15 1995/01/10 00:04:03 christos Exp $ */ /* $NetBSD: svr4_misc.c,v 1.16 1995/01/22 23:44:48 christos Exp $ */
/* /*
* Copyright (c) 1994 Christos Zoulas * Copyright (c) 1994 Christos Zoulas
@ -95,13 +95,30 @@ svr4_wait(p, uap, retval)
register_t *retval; register_t *retval;
{ {
struct wait4_args w4; struct wait4_args w4;
int error;
size_t sz = sizeof(*SCARG(&w4, status));
SCARG(&w4, rusage) = NULL; SCARG(&w4, rusage) = NULL;
SCARG(&w4, options) = 0; SCARG(&w4, options) = 0;
SCARG(&w4, status) = SCARG(uap, status);
if (SCARG(uap, status) == NULL) {
caddr_t sg = stackgap_init();
SCARG(&w4, status) = stackgap_alloc(&sg, sz);
}
else
SCARG(&w4, status) = SCARG(uap, status);
SCARG(&w4, pid) = WAIT_ANY; SCARG(&w4, pid) = WAIT_ANY;
return wait4(p, &w4, retval); if ((error = wait4(p, &w4, retval)) != 0)
return error;
/*
* It looks like wait(2) on svr4/solaris/2.4 returns
* the status in retval[1], and the pid on retval[0].
* NB: this can break if register_t stops being an int.
*/
return copyin(SCARG(&w4, status), &retval[1], sz);
} }

47
sys/compat/svr4/svr4_util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: svr4_util.c,v 1.4 1994/10/29 00:43:31 christos Exp $ */ /* $NetBSD: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp $ */
/* /*
* Copyright (c) 1994 Christos Zoulas * Copyright (c) 1994 Christos Zoulas
@ -37,6 +37,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/malloc.h> #include <sys/malloc.h>
#include <sys/vnode.h>
#include <compat/svr4/svr4_util.h> #include <compat/svr4/svr4_util.h>
@ -51,6 +52,9 @@ svr4_emul_find(p, sgp, prefix, path, pbuf)
char **pbuf; char **pbuf;
{ {
struct nameidata nd; struct nameidata nd;
struct nameidata ndroot;
struct vattr vat;
struct vattr vatroot;
int error; int error;
char *ptr, *buf; char *ptr, *buf;
size_t sz, len; size_t sz, len;
@ -83,6 +87,7 @@ svr4_emul_find(p, sgp, prefix, path, pbuf)
free(buf, M_TEMP); free(buf, M_TEMP);
return EINVAL; return EINVAL;
} }
NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, buf, p); NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, buf, p);
if ((error = namei(&nd)) != 0) { if ((error = namei(&nd)) != 0) {
@ -90,6 +95,44 @@ svr4_emul_find(p, sgp, prefix, path, pbuf)
free(buf, M_TEMP); free(buf, M_TEMP);
return error; return error;
} }
/*
* We now compare the vnode of the svr4_root to the one
* vnode asked. If they resolve to be the same, then we
* ignore the match so that the real root gets used.
* This avoids the problem of traversing "../.." to find the
* root directory and never finding it, because "/" resolves
* to the emulation root directory. This is expensive :-(
*/
/* XXX: prototype should have const here for NDINIT */
NDINIT(&ndroot, LOOKUP, FOLLOW, UIO_SYSSPACE,
(char *) svr4_emul_path, p);
if ((error = namei(&ndroot)) != 0) {
/* Cannot happen! */
DPRINTF(("no %s!\n", svr4_emul_path));
free(buf, M_TEMP);
vrele(nd.ni_vp);
return error;
}
if ((error = VOP_GETATTR(nd.ni_vp, &vat, p->p_ucred, p)) != 0) {
DPRINTF(("no attr for directory\n"));
goto done;
}
if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, p->p_ucred, p)) != 0) {
DPRINTF(("no attr for root\n"));
goto done;
}
if (vat.va_fsid == vatroot.va_fsid &&
vat.va_fileid == vatroot.va_fileid) {
DPRINTF(("return the real root\n"));
error = ENOENT;
goto done;
}
if (sgp == NULL) if (sgp == NULL)
*pbuf = buf; *pbuf = buf;
else { else {
@ -101,6 +144,8 @@ svr4_emul_find(p, sgp, prefix, path, pbuf)
DPRINTF(("ok\n")); DPRINTF(("ok\n"));
done:
vrele(nd.ni_vp); vrele(nd.ni_vp);
vrele(ndroot.ni_vp);
return error; return error;
} }