mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-28 16:43:09 +00:00
Code Issues Releases Activity

- Change namei() to use td_ucred instead of p_ucred.

Browse Source 
- Change the hack in access() that uses a temporary credential to set
  td_ucred to the temp cred instead of p_ucred.
This commit is contained in:
John Baldwin 2002-02-27 19:15:29 +00:00
parent 6f105b3444
commit bdd67d483c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=91419
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/kern/vfs_extattr.c
View File

@ -1838,7 +1838,6 @@ access(td, uap)
int error; int error;
struct nameidata nd; struct nameidata nd;
cred = td->td_proc->p_ucred;
/* /*
* Create and modify a temporary credential instead of one that * Create and modify a temporary credential instead of one that
* is potentially shared. This could also mess up socket * is potentially shared. This could also mess up socket
@ -1848,10 +1847,11 @@ access(td, uap)
* may be better to explicitly pass the credential to namei() * may be better to explicitly pass the credential to namei()
* rather than to modify the potentially shared process structure. * rather than to modify the potentially shared process structure.
*/ */
cred = td->td_ucred;
tmpcred = crdup(cred); tmpcred = crdup(cred);
tmpcred->cr_uid = cred->cr_ruid; tmpcred->cr_uid = cred->cr_ruid;
tmpcred->cr_groups[0] = cred->cr_rgid; tmpcred->cr_groups[0] = cred->cr_rgid;
td->td_proc->p_ucred = tmpcred; td->td_ucred = tmpcred;
NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ, UIO_USERSPACE, NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ, UIO_USERSPACE,
SCARG(uap, path), td); SCARG(uap, path), td);
if ((error = namei(&nd)) != 0) if ((error = namei(&nd)) != 0)
@ -1862,7 +1862,7 @@ access(td, uap)
NDFREE(&nd, NDF_ONLY_PNBUF); NDFREE(&nd, NDF_ONLY_PNBUF);
vput(vp); vput(vp);
out1: out1:
td->td_proc->p_ucred = cred; td->td_ucred = cred;
crfree(tmpcred); crfree(tmpcred);
return (error); return (error);
} }

2
sys/kern/vfs_lookup.c
View File

@ -104,7 +104,7 @@ namei(ndp)
struct thread *td = cnp->cn_thread; struct thread *td = cnp->cn_thread;
struct proc *p = td->td_proc; struct proc *p = td->td_proc;
ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_thread->td_proc->p_ucred; ndp->ni_cnd.cn_cred = ndp->ni_cnd.cn_thread->td_ucred;
KASSERT(cnp->cn_cred && p, ("namei: bad cred/proc")); KASSERT(cnp->cn_cred && p, ("namei: bad cred/proc"));
KASSERT((cnp->cn_nameiop & (~OPMASK)) == 0, KASSERT((cnp->cn_nameiop & (~OPMASK)) == 0,
("namei: nameiop contaminated with flags")); ("namei: nameiop contaminated with flags"));

6
sys/kern/vfs_syscalls.c
View File

@ -1838,7 +1838,6 @@ access(td, uap)
int error; int error;
struct nameidata nd; struct nameidata nd;
cred = td->td_proc->p_ucred;
/* /*
* Create and modify a temporary credential instead of one that * Create and modify a temporary credential instead of one that
* is potentially shared. This could also mess up socket * is potentially shared. This could also mess up socket
@ -1848,10 +1847,11 @@ access(td, uap)
* may be better to explicitly pass the credential to namei() * may be better to explicitly pass the credential to namei()
* rather than to modify the potentially shared process structure. * rather than to modify the potentially shared process structure.
*/ */
cred = td->td_ucred;
tmpcred = crdup(cred); tmpcred = crdup(cred);
tmpcred->cr_uid = cred->cr_ruid; tmpcred->cr_uid = cred->cr_ruid;
tmpcred->cr_groups[0] = cred->cr_rgid; tmpcred->cr_groups[0] = cred->cr_rgid;
td->td_proc->p_ucred = tmpcred; td->td_ucred = tmpcred;
NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ, UIO_USERSPACE, NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | NOOBJ, UIO_USERSPACE,
SCARG(uap, path), td); SCARG(uap, path), td);
if ((error = namei(&nd)) != 0) if ((error = namei(&nd)) != 0)
@ -1862,7 +1862,7 @@ access(td, uap)
NDFREE(&nd, NDF_ONLY_PNBUF); NDFREE(&nd, NDF_ONLY_PNBUF);
vput(vp); vput(vp);
out1: out1:
td->td_proc->p_ucred = cred; td->td_ucred = cred;
crfree(tmpcred); crfree(tmpcred);
return (error); return (error);
} }