From e61b3df742e7640fb142a83bb10a0f7acdc04e9e Mon Sep 17 00:00:00 2001 From: Michael Neumann Date: Mon, 13 Jul 2009 00:01:43 +0200 Subject: [PATCH] Simplify expressions --- sys/kern/kern_varsym.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_varsym.c b/sys/kern/kern_varsym.c index 53d64f1010..56ff817310 100644 --- a/sys/kern/kern_varsym.c +++ b/sys/kern/kern_varsym.c @@ -134,8 +134,11 @@ sys_varsym_set(struct varsym_set_args *uap) { char name[MAXVARSYM_NAME]; char *buf; + struct proc *p; int error; + p = curproc; + if ((error = copyinstr(uap->name, name, sizeof(name), NULL)) != 0) goto done2; buf = kmalloc(MAXVARSYM_DATA, M_TEMP, M_WAITOK); @@ -146,11 +149,11 @@ sys_varsym_set(struct varsym_set_args *uap) } switch(uap->level) { case VARSYM_SYS: - if (curthread->td_proc != NULL && curthread->td_proc->p_ucred->cr_prison != NULL) + if (p != NULL && p->p_ucred->cr_prison != NULL) uap->level = VARSYM_PRISON; case VARSYM_PRISON: - if (curthread->td_proc != NULL && - (error = priv_check_cred(curthread->td_proc->p_ucred, PRIV_ROOT, PRISON_ROOT)) != 0) + if (p != NULL && + (error = priv_check_cred(p->p_ucred, PRIV_ROOT, PRISON_ROOT)) != 0) break; /* fall through */ case VARSYM_USER: -- 2.11.4.GIT