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

Proc locking.

Browse Source
This commit is contained in:
jhb 2001-01-24 00:35:12 +00:00
parent 1046fa2a8d
commit 7c01c0a2c2
4 changed files with 100 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sys/kern/kern_acl.c
View File

@ -72,16 +72,22 @@ vacl_set_acl(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernacl;
struct ucred *uc;
int error;
error = copyin(aclp, &inkernacl, sizeof(struct acl));
if (error)
return(error);
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_SETACL(vp, type, &inkernacl, p->p_ucred, p);
error = VOP_SETACL(vp, type, &inkernacl, uc, p);
VOP_UNLOCK(vp, 0, p);
return(error);
crfree(uc);
return (error);
}
/*
@ -92,12 +98,18 @@ vacl_get_acl(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernelacl;
struct ucred *uc;
int error;
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_GETACL(vp, type, &inkernelacl, p->p_ucred, p);
error = VOP_GETACL(vp, type, &inkernelacl, uc, p);
VOP_UNLOCK(vp, 0, p);
crfree(uc);
if (error == 0)
error = copyout(&inkernelacl, aclp, sizeof(struct acl));
return (error);
@ -109,12 +121,18 @@ vacl_get_acl(struct proc *p, struct vnode *vp, acl_type_t type,
static int
vacl_delete(struct proc *p, struct vnode *vp, acl_type_t type)
{
struct ucred *uc;
int error;
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, p->p_ucred, p);
error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, uc, p);
VOP_UNLOCK(vp, 0, p);
crfree(uc);
return (error);
}
@ -126,12 +144,18 @@ vacl_aclcheck(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernelacl;
struct ucred *uc;
int error;
error = copyin(aclp, &inkernelacl, sizeof(struct acl));
if (error)
return(error);
error = VOP_ACLCHECK(vp, type, &inkernelacl, p->p_ucred, p);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
error = VOP_ACLCHECK(vp, type, &inkernelacl, uc, p);
crfree(uc);
return (error);
}

6
sys/kern/kern_event.c
View File

@ -215,8 +215,9 @@ filt_procattach(struct knote *kn)
kn->kn_flags &= ~EV_FLAG1;
}
/* XXX lock the proc here while adding to the list? */
PROC_LOCK(p);
SLIST_INSERT_HEAD(&p->p_klist, kn, kn_selnext);
PROC_UNLOCK(p);
return (0);
}
@ -237,8 +238,9 @@ filt_procdetach(struct knote *kn)
if (kn->kn_status & KN_DETACHED)
return;
/* XXX locking? this might modify another process. */
PROC_LOCK(p);
SLIST_REMOVE(&p->p_klist, kn, knote, kn_selnext);
PROC_UNLOCK(p);
}
static int

40
sys/kern/subr_acl_posix1e.c
View File

@ -72,16 +72,22 @@ vacl_set_acl(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernacl;
struct ucred *uc;
int error;
error = copyin(aclp, &inkernacl, sizeof(struct acl));
if (error)
return(error);
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_SETACL(vp, type, &inkernacl, p->p_ucred, p);
error = VOP_SETACL(vp, type, &inkernacl, uc, p);
VOP_UNLOCK(vp, 0, p);
return(error);
crfree(uc);
return (error);
}
/*
@ -92,12 +98,18 @@ vacl_get_acl(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernelacl;
struct ucred *uc;
int error;
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_GETACL(vp, type, &inkernelacl, p->p_ucred, p);
error = VOP_GETACL(vp, type, &inkernelacl, uc, p);
VOP_UNLOCK(vp, 0, p);
crfree(uc);
if (error == 0)
error = copyout(&inkernelacl, aclp, sizeof(struct acl));
return (error);
@ -109,12 +121,18 @@ vacl_get_acl(struct proc *p, struct vnode *vp, acl_type_t type,
static int
vacl_delete(struct proc *p, struct vnode *vp, acl_type_t type)
{
struct ucred *uc;
int error;
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, p->p_ucred, p);
error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, uc, p);
VOP_UNLOCK(vp, 0, p);
crfree(uc);
return (error);
}
@ -126,12 +144,18 @@ vacl_aclcheck(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernelacl;
struct ucred *uc;
int error;
error = copyin(aclp, &inkernelacl, sizeof(struct acl));
if (error)
return(error);
error = VOP_ACLCHECK(vp, type, &inkernelacl, p->p_ucred, p);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
error = VOP_ACLCHECK(vp, type, &inkernelacl, uc, p);
crfree(uc);
return (error);
}

40
sys/kern/vfs_acl.c
View File

@ -72,16 +72,22 @@ vacl_set_acl(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernacl;
struct ucred *uc;
int error;
error = copyin(aclp, &inkernacl, sizeof(struct acl));
if (error)
return(error);
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_SETACL(vp, type, &inkernacl, p->p_ucred, p);
error = VOP_SETACL(vp, type, &inkernacl, uc, p);
VOP_UNLOCK(vp, 0, p);
return(error);
crfree(uc);
return (error);
}
/*
@ -92,12 +98,18 @@ vacl_get_acl(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernelacl;
struct ucred *uc;
int error;
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_GETACL(vp, type, &inkernelacl, p->p_ucred, p);
error = VOP_GETACL(vp, type, &inkernelacl, uc, p);
VOP_UNLOCK(vp, 0, p);
crfree(uc);
if (error == 0)
error = copyout(&inkernelacl, aclp, sizeof(struct acl));
return (error);
@ -109,12 +121,18 @@ vacl_get_acl(struct proc *p, struct vnode *vp, acl_type_t type,
static int
vacl_delete(struct proc *p, struct vnode *vp, acl_type_t type)
{
struct ucred *uc;
int error;
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
VOP_LEASE(vp, p, uc, LEASE_WRITE);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, p->p_ucred, p);
error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, uc, p);
VOP_UNLOCK(vp, 0, p);
crfree(uc);
return (error);
}
@ -126,12 +144,18 @@ vacl_aclcheck(struct proc *p, struct vnode *vp, acl_type_t type,
struct acl *aclp)
{
struct acl inkernelacl;
struct ucred *uc;
int error;
error = copyin(aclp, &inkernelacl, sizeof(struct acl));
if (error)
return(error);
error = VOP_ACLCHECK(vp, type, &inkernelacl, p->p_ucred, p);
PROC_LOCK(p);
uc = p->p_ucred;
crhold(uc);
PROC_UNLOCK(p);
error = VOP_ACLCHECK(vp, type, &inkernelacl, uc, p);
crfree(uc);
return (error);
}