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

Lock receive socket buffer in soo_stat() rather than commenting that we

Browse Source 
should lock it, which may marginally improve the consistency of the
results.  Remove comment.

MFC after:	3 days
This commit is contained in:
Robert Watson 2008-10-07 07:10:28 +00:00
parent c94526e26d
commit 58f7ce962c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=183661
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/kern/sys_socket.c
View File

@ -246,17 +246,16 @@ soo_stat(struct file *fp, struct stat *ub, struct ucred *active_cred,
/* /*
* If SBS_CANTRCVMORE is set, but there's still data left in the * If SBS_CANTRCVMORE is set, but there's still data left in the
* receive buffer, the socket is still readable. * receive buffer, the socket is still readable.
*
* XXXRW: perhaps should lock socket buffer so st_size result is
* consistent.
*/ */
/* Unlocked read. */ SOCKBUF_LOCK(&so->so_rcv);
if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 || if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 ||
so->so_rcv.sb_cc != 0) so->so_rcv.sb_cc != 0)
ub->st_mode |= S_IRUSR | S_IRGRP | S_IROTH; ub->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;
ub->st_size = so->so_rcv.sb_cc - so->so_rcv.sb_ctl;
SOCKBUF_UNLOCK(&so->so_rcv);
/* Unlocked read. */
if ((so->so_snd.sb_state & SBS_CANTSENDMORE) == 0) if ((so->so_snd.sb_state & SBS_CANTSENDMORE) == 0)
ub->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH; ub->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
ub->st_size = so->so_rcv.sb_cc - so->so_rcv.sb_ctl;
ub->st_uid = so->so_cred->cr_uid; ub->st_uid = so->so_cred->cr_uid;
ub->st_gid = so->so_cred->cr_gid; ub->st_gid = so->so_cred->cr_gid;
return (*so->so_proto->pr_usrreqs->pru_sense)(so, ub); return (*so->so_proto->pr_usrreqs->pru_sense)(so, ub);