summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2006-04-23 18:15:54 +0000
committerrwatson <rwatson@FreeBSD.org>2006-04-23 18:15:54 +0000
commit54902641b6fecf4b08193945e772ee840b34fc89 (patch)
tree562a6d2051780043a3626ea8b1abbd20964aeac7 /sys/kern
parentb6a29644300546ce70b02879a2c08ac130791d36 (diff)
downloadFreeBSD-src-54902641b6fecf4b08193945e772ee840b34fc89.zip
FreeBSD-src-54902641b6fecf4b08193945e772ee840b34fc89.tar.gz
Assert that sockets passed into soabort() not be SQ_COMP or SQ_INCOMP,
since that removal should have been done a layer up. MFC after: 3 months
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/uipc_socket.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 854511c..b35faf0 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -559,8 +559,10 @@ soabort(so)
* is as close as we can get for now.
*/
KASSERT(so->so_count == 0, ("soabort: so_count"));
- KASSERT(!(so->so_state & SS_PROTOREF), ("soabort: SS_PROTOREF"));
+ KASSERT((so->so_state & SS_PROTOREF) == 0, ("soabort: SS_PROTOREF"));
KASSERT(so->so_state & SS_NOFDREF, ("soabort: !SS_NOFDREF"));
+ KASSERT((so->so_state & SQ_COMP) == 0, ("soabort: SQ_COMP"));
+ KASSERT((so->so_state & SQ_INCOMP) == 0, ("soabort: SQ_INCOMP"));
(*so->so_proto->pr_usrreqs->pru_abort)(so);
ACCEPT_LOCK();
OpenPOWER on IntegriCloud