diff options
| -rw-r--r-- | sys/kern/kern_descrip.c | 6 | ||||
| -rw-r--r-- | sys/kern/kern_event.c | 1 | ||||
| -rw-r--r-- | sys/kern/sys_socket.c | 6 | ||||
| -rw-r--r-- | sys/kern/vfs_vnops.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 2953752..43fc68e 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -1005,9 +1005,7 @@ ofstat(td, uap) if ((error = fget(td, uap->fd, &fp)) != 0) goto done2; - mtx_lock(&Giant); error = fo_stat(fp, &ub, td->td_ucred, td); - mtx_unlock(&Giant); if (error == 0) { cvtstat(&ub, &oub); error = copyout(&oub, uap->sb, sizeof(oub)); @@ -1042,9 +1040,7 @@ fstat(td, uap) if ((error = fget(td, uap->fd, &fp)) != 0) goto done2; - mtx_lock(&Giant); error = fo_stat(fp, &ub, td->td_ucred, td); - mtx_unlock(&Giant); if (error == 0) error = copyout(&ub, uap->sb, sizeof(ub)); fdrop(fp, td); @@ -1077,9 +1073,7 @@ nfstat(td, uap) if ((error = fget(td, uap->fd, &fp)) != 0) goto done2; - mtx_lock(&Giant); error = fo_stat(fp, &ub, td->td_ucred, td); - mtx_unlock(&Giant); if (error == 0) { cvtnstat(&ub, &nub); error = copyout(&nub, uap->sb, sizeof(nub)); diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 4d3870e..1d222ab 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -889,6 +889,7 @@ kqueue_stat(struct file *fp, struct stat *st, struct ucred *active_cred, { struct kqueue *kq; + /* Unlocked read. */ kq = fp->f_data; bzero((void *)st, sizeof(*st)); st->st_size = kq->kq_count; diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index e1de4b7..cbaa587 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -225,9 +225,11 @@ soo_stat(fp, ub, active_cred, td) struct thread *td; { struct socket *so = fp->f_data; + int error; bzero((caddr_t)ub, sizeof (*ub)); ub->st_mode = S_IFSOCK; + NET_LOCK_GIANT(); /* * If SBS_CANTRCVMORE is set, but there's still data left in the * receive buffer, the socket is still readable. @@ -244,7 +246,9 @@ soo_stat(fp, ub, active_cred, td) ub->st_size = so->so_rcv.sb_cc - so->so_rcv.sb_ctl; ub->st_uid = so->so_cred->cr_uid; ub->st_gid = so->so_cred->cr_gid; - return ((*so->so_proto->pr_usrreqs->pru_sense)(so, ub)); + error = (*so->so_proto->pr_usrreqs->pru_sense)(so, ub); + NET_UNLOCK_GIANT(); + return (error); } /* diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 107feeb..f36b78f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -622,9 +622,11 @@ vn_statfile(fp, sb, active_cred, td) struct vnode *vp = fp->f_vnode; int error; + mtx_lock(&Giant); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); error = vn_stat(vp, sb, active_cred, fp->f_cred, td); VOP_UNLOCK(vp, 0, td); + mtx_unlock(&Giant); return (error); } |
