svn commit: r208874 - head/sys/netinet

[Randall Stewart]

Author: rrs
Date: Sun Jun  6 16:07:40 2010
New Revision: 208874
URL: http://svn.freebsd.org/changeset/base/208874

Log:
  Fix a bug in sctp_abort_assoc(). DON'T call the sctp_inpcb_free
  when the gone flag is set. You don't know what locks the
  caller has set and there is already a kill timer running.
  
  MFC after:	1 week

Modified:
  head/sys/netinet/sctputil.c

Modified: head/sys/netinet/sctputil.c
==============================================================================
--- head/sys/netinet/sctputil.c	Sun Jun  6 15:27:08 2010	(r208873)
+++ head/sys/netinet/sctputil.c	Sun Jun  6 16:07:40 2010	(r208874)
@@ -3823,13 +3823,6 @@ sctp_abort_association(struct sctp_inpcb
 #if defined (__APPLE__) || defined(SCTP_SO_LOCK_TESTING)
 		SCTP_SOCKET_UNLOCK(so, 1);
 #endif
-	} else {
-		if (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) {
-			if (LIST_FIRST(&inp->sctp_asoc_list) == NULL) {
-				sctp_inpcb_free(inp, SCTP_FREE_SHOULD_USE_ABORT,
-				    SCTP_CALLED_DIRECTLY_NOCMPSET);
-			}
-		}
 	}
 }