diff options
Diffstat (limited to 'sys/compat/linux')
-rw-r--r-- | sys/compat/linux/linux_file.c | 2 | ||||
-rw-r--r-- | sys/compat/linux/linux_getcwd.c | 8 | ||||
-rw-r--r-- | sys/compat/linux/linux_misc.c | 6 | ||||
-rw-r--r-- | sys/compat/linux/linux_uid16.c | 6 | ||||
-rw-r--r-- | sys/compat/linux/linux_util.c | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index dd4f219..0d9273e 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -285,7 +285,7 @@ getdents_common(struct thread *td, struct linux_getdents64_args *args, return (EINVAL); } - if ((error = VOP_GETATTR(vp, &va, td->td_proc->p_ucred, td))) { + if ((error = VOP_GETATTR(vp, &va, td->td_ucred, td))) { fdrop(fp, td); return (error); } diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 509cdec..2a09fd3 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -132,7 +132,7 @@ linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td) * current directory is still locked. */ if (bufp != NULL) { - error = VOP_GETATTR(lvp, &va, td->td_proc->p_ucred, td); + error = VOP_GETATTR(lvp, &va, td->td_ucred, td); if (error) { vput(lvp); *lvpp = NULL; @@ -148,7 +148,7 @@ linux_getcwd_scandir(lvpp, uvpp, bpp, bufp, td) cn.cn_nameiop = LOOKUP; cn.cn_flags = ISLASTCN | ISDOTDOT | RDONLY; cn.cn_thread = td; - cn.cn_cred = td->td_proc->p_ucred; + cn.cn_cred = td->td_ucred; cn.cn_pnbuf = NULL; cn.cn_nameptr = ".."; cn.cn_namelen = 2; @@ -200,7 +200,7 @@ unionread: eofflag = 0; - error = VOP_READDIR(uvp, &uio, td->td_proc->p_ucred, &eofflag, 0, 0); + error = VOP_READDIR(uvp, &uio, td->td_ucred, &eofflag, 0, 0); off = uio.uio_offset; @@ -335,7 +335,7 @@ linux_getcwd_common (lvp, rvp, bpp, bufp, limit, flags, td) * whether or not caller cares. */ if (flags & GETCWD_CHECK_ACCESS) { - error = VOP_ACCESS(lvp, perms, td->td_proc->p_ucred, td); + error = VOP_ACCESS(lvp, perms, td->td_ucred, td); if (error) goto out; perms = VEXEC|VREAD; diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 031c406..68f99fb 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -284,7 +284,7 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args) } /* Executable? */ - error = VOP_GETATTR(vp, &attr, td->td_proc->p_ucred, td); + error = VOP_GETATTR(vp, &attr, td->td_ucred, td); if (error) goto cleanup; @@ -301,11 +301,11 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args) } /* Can we access it? */ - error = VOP_ACCESS(vp, VEXEC, td->td_proc->p_ucred, td); + error = VOP_ACCESS(vp, VEXEC, td->td_ucred, td); if (error) goto cleanup; - error = VOP_OPEN(vp, FREAD, td->td_proc->p_ucred, td); + error = VOP_OPEN(vp, FREAD, td->td_ucred, td); if (error) goto cleanup; diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index dcb61a7..f768bae 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -152,7 +152,7 @@ linux_getgroups16(struct thread *td, struct linux_getgroups16_args *args) printf(ARGS(getgroups16, "%d, *"), args->gidsetsize); #endif - cred = td->td_proc->p_ucred; + cred = td->td_ucred; bsd_gidset = cred->cr_groups; bsd_gidsetsz = cred->cr_ngroups - 1; @@ -200,7 +200,7 @@ int linux_getgid16(struct thread *td, struct linux_getgid16_args *args) { - td->td_retval[0] = td->td_proc->p_ucred->cr_rgid; + td->td_retval[0] = td->td_ucred->cr_rgid; return (0); } @@ -208,7 +208,7 @@ int linux_getuid16(struct thread *td, struct linux_getuid16_args *args) { - td->td_retval[0] = td->td_proc->p_ucred->cr_ruid; + td->td_retval[0] = td->td_ucred->cr_ruid; return (0); } diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index c30d0f4..4949a45 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -140,11 +140,11 @@ linux_emul_find(td, sgp, path, pbuf, cflag) return error; } - if ((error = VOP_GETATTR(nd.ni_vp, &vat, td->td_proc->p_ucred, td)) != 0) { + if ((error = VOP_GETATTR(nd.ni_vp, &vat, td->td_ucred, td)) != 0) { goto bad; } - if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, td->td_proc->p_ucred, td)) + if ((error = VOP_GETATTR(ndroot.ni_vp, &vatroot, td->td_ucred, td)) != 0) { goto bad; } |