From 0cec9959e8af91e400d1a6d04d9a511e4eaabdf6 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sun, 23 Apr 2006 18:15:54 +0000 Subject: [PATCH] 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 --- sys/kern/uipc_socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 854511c595ff..b35faf0649cf 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();