mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Use td_ucred of curthread instead of p_ucred of curproc. This required

Browse Source 
changing sem_perm() and sem_hasopen() to take a thread instead of a proc
for the first argument.
This commit is contained in:
John Baldwin 2003-03-20 21:12:31 +00:00
parent a6b47b5f08
commit b254666064
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=112449
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/kern/uipc_sem.c
View File

@ -54,11 +54,11 @@ static struct ksem *sem_lookup_byname(const char *name);
static int sem_create(struct thread *td, const char *name,
struct ksem **ksret, mode_t mode, unsigned int value);
static void sem_free(struct ksem *ksnew);
static int sem_perm(struct proc *p, struct ksem *ks);
static int sem_perm(struct thread *td, struct ksem *ks);
static void sem_enter(struct proc *p, struct ksem *ks);
static int sem_leave(struct proc *p, struct ksem *ks);
static void sem_exithook(struct proc *p);
static int sem_hasopen(struct proc *p, struct ksem *ks);
static int sem_hasopen(struct thread *td, struct ksem *ks);
static int kern_sem_close(struct thread *td, semid_t id);
static int kern_sem_post(struct thread *td, semid_t id);
@ -185,7 +185,7 @@ sem_create(td, name, ksret, mode, value)
DP(("sem_create\n"));
p = td->td_proc;
uc = p->p_ucred;
uc = td->td_ucred;
if (value > SEM_VALUE_MAX)
return (EINVAL);
ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO);
@ -394,7 +394,7 @@ kern_sem_open(td, dir, name, oflag, mode, value, idp)
/*
* if we aren't the creator, then enforce permissions.
*/
error = sem_perm(td->td_proc, ks);
error = sem_perm(td, ks);
if (!error)
sem_ref(ks);
mtx_unlock(&sem_lock);
@ -421,19 +421,19 @@ kern_sem_open(td, dir, name, oflag, mode, value, idp)
}
static int
sem_perm(p, ks)
struct proc *p;
sem_perm(td, ks)
struct thread *td;
struct ksem *ks;
{
struct ucred *uc;
uc = p->p_ucred;
uc = td->td_ucred;
DP(("sem_perm: uc(%d,%d) ks(%d,%d,%o)\n",
uc->cr_uid, uc->cr_gid,
ks->ks_uid, ks->ks_gid, ks->ks_mode));
if ((uc->cr_uid == ks->ks_uid && (ks->ks_mode & S_IWUSR) != 0) ||
(uc->cr_gid == ks->ks_gid && (ks->ks_mode & S_IWGRP) != 0) ||
(ks->ks_mode & S_IWOTH) != 0 || suser_cred(uc, 0) == 0)
(ks->ks_mode & S_IWOTH) != 0 || suser(td) == 0)
return (0);
return (EPERM);
}
@ -467,13 +467,13 @@ sem_getuser(p, ks)
}
static int
sem_hasopen(p, ks)
struct proc *p;
sem_hasopen(td, ks)
struct thread *td;
struct ksem *ks;
{
return ((ks->ks_name == NULL && sem_perm(p, ks))
|| sem_getuser(p, ks) != NULL);
return ((ks->ks_name == NULL && sem_perm(td, ks))
|| sem_getuser(td->td_proc, ks) != NULL);
}
static int
@ -552,7 +552,7 @@ kern_sem_unlink(td, name)
if (ks == NULL)
error = ENOENT;
else
error = sem_perm(td->td_proc, ks);
error = sem_perm(td, ks);
DP(("sem_unlink: '%s' ks = %p, error = %d\n", name, ks, error));
if (error == 0) {
LIST_REMOVE(ks, ks_entry);
@ -620,7 +620,7 @@ kern_sem_post(td, id)
mtx_lock(&sem_lock);
ks = ID_TO_SEM(id);
if (ks == NULL || !sem_hasopen(td->td_proc, ks)) {
if (ks == NULL || !sem_hasopen(td, ks)) {
error = EINVAL;
goto err;
}
@ -686,7 +686,7 @@ kern_sem_wait(td, id, tryflag)
goto err;
}
sem_ref(ks);
if (!sem_hasopen(td->td_proc, ks)) {
if (!sem_hasopen(td, ks)) {
DP(("kern_sem_wait hasopen failed\n"));
error = EINVAL;
goto err;
@ -726,7 +726,7 @@ ksem_getvalue(td, uap)
mtx_lock(&sem_lock);
ks = ID_TO_SEM(uap->id);
if (ks == NULL || !sem_hasopen(td->td_proc, ks)) {
if (ks == NULL || !sem_hasopen(td, ks)) {
mtx_unlock(&sem_lock);
return (EINVAL);
}
@ -752,7 +752,7 @@ ksem_destroy(td, uap)
mtx_lock(&sem_lock);
ks = ID_TO_SEM(uap->id);
if (ks == NULL || !sem_hasopen(td->td_proc, ks) ||
if (ks == NULL || !sem_hasopen(td, ks) ||
ks->ks_name != NULL) {
error = EINVAL;
goto err;