d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use crcopysafe in jail_attach.

Browse Source
This commit is contained in:
Jamie Gritton 2016-04-26 21:19:12 +00:00
parent b76565c267
commit 1fb6767d27
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_jail.c
View File

@ -2405,7 +2405,6 @@ sys_jail_attach(struct thread *td, struct jail_attach_args *uap)
static int static int
do_jail_attach(struct thread *td, struct prison *pr) do_jail_attach(struct thread *td, struct prison *pr)
{ {
struct prison *ppr;
struct proc *p; struct proc *p;
struct ucred *newcred, *oldcred; struct ucred *newcred, *oldcred;
int error; int error;
@ -2433,7 +2432,6 @@ do_jail_attach(struct thread *td, struct prison *pr)
/* /*
* Reparent the newly attached process to this jail. * Reparent the newly attached process to this jail.
*/ */
ppr = td->td_ucred->cr_prison;
p = td->td_proc; p = td->td_proc;
error = cpuset_setproc_update_set(p, pr->pr_cpuset); error = cpuset_setproc_update_set(p, pr->pr_cpuset);
if (error) if (error)
@ -2452,23 +2450,23 @@ do_jail_attach(struct thread *td, struct prison *pr)
newcred = crget(); newcred = crget();
PROC_LOCK(p); PROC_LOCK(p);
oldcred = p->p_ucred; oldcred = crcopysafe(p, newcred);
setsugid(p);
crcopy(newcred, oldcred);
newcred->cr_prison = pr; newcred->cr_prison = pr;
proc_set_cred(p, newcred); proc_set_cred(p, newcred);
setsugid(p);
PROC_UNLOCK(p); PROC_UNLOCK(p);
#ifdef RACCT #ifdef RACCT
racct_proc_ucred_changed(p, oldcred, newcred); racct_proc_ucred_changed(p, oldcred, newcred);
#endif #endif
prison_deref(oldcred->cr_prison, PD_DEREF | PD_DEUREF);
crfree(oldcred); crfree(oldcred);
prison_deref(ppr, PD_DEREF | PD_DEUREF);
return (0); return (0);
e_unlock: e_unlock:
VOP_UNLOCK(pr->pr_root, 0); VOP_UNLOCK(pr->pr_root, 0);
e_revert_osd: e_revert_osd:
/* Tell modules this thread is still in its old jail after all. */ /* Tell modules this thread is still in its old jail after all. */
(void)osd_jail_call(ppr, PR_METHOD_ATTACH, td); (void)osd_jail_call(td->td_ucred->cr_prison, PR_METHOD_ATTACH, td);
prison_deref(pr, PD_DEREF | PD_DEUREF); prison_deref(pr, PD_DEREF | PD_DEUREF);
return (error); return (error);
} }