Author: glebius
Date: Mon Mar 25 18:19:37 2019
New Revision: 345511
URL: https://svnweb.freebsd.org/changeset/base/345511
Log:
Merge r344741:
Remove bogus assert that I added in r319722. It is a legitimate case
to call soabort() on a newborn socket created by sonewconn() in case
if further setup of PCB failed. Code in sofree() handles such socket
correctly.
Submitted by: jtl, rrs
Modified:
stable/12/sys/kern/uipc_socket.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/kern/uipc_socket.c
==============================================================================
--- stable/12/sys/kern/uipc_socket.c Mon Mar 25 18:02:04 2019
(r345510)
+++ stable/12/sys/kern/uipc_socket.c Mon Mar 25 18:19:37 2019
(r345511)
@@ -1174,7 +1174,6 @@ soabort(struct socket *so)
KASSERT(so->so_count == 0, ("soabort: so_count"));
KASSERT((so->so_state & SS_PROTOREF) == 0, ("soabort: SS_PROTOREF"));
KASSERT(so->so_state & SS_NOFDREF, ("soabort: !SS_NOFDREF"));
- KASSERT(so->so_qstate == SQ_NONE, ("soabort: !SQ_NONE"));
VNET_SO_ASSERT(so);
if (so->so_proto->pr_usrreqs->pru_abort != NULL)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
