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

Assert socket buffer lock at strategic points between sections of code

Browse Source 
in soreceive() to confirm we've moved from block to block properly
maintaining locking invariants.
This commit is contained in:
rwatson 2004-07-10 03:47:15 +00:00
parent 10c37ef567
commit e3e0b9a496
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/kern/uipc_socket.c
View File

@ -949,6 +949,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp)
so->so_error = 0;
goto release;
}
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
if (so->so_rcv.sb_state & SBS_CANTRCVMORE) {
if (m)
goto dontblock;
@ -1115,6 +1116,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp)
goto release;
} else
uio->uio_resid -= len;
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
if (len == m->m_len - moff) {
if (m->m_flags & M_EOR)
flags |= MSG_EOR;
@ -1158,6 +1160,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp)
so->so_rcv.sb_cc -= len;
}
}
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
if (so->so_oobmark) {
if ((flags & MSG_PEEK) == 0) {
so->so_oobmark -= len;
@ -1206,6 +1209,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp)
}
}
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
if (m != NULL && pr->pr_flags & PR_ATOMIC) {
flags |= MSG_TRUNC;
if ((flags & MSG_PEEK) == 0) {
@ -1248,6 +1252,7 @@ soreceive(so, psa, uio, mp0, controlp, flagsp)
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
sbunlock(&so->so_rcv);
out:
SOCKBUF_LOCK_ASSERT(&so->so_rcv);
SOCKBUF_UNLOCK(&so->so_rcv);
return (error);
}