Author: tuexen
Date: Fri Jul 20 09:49:50 2012
New Revision: 238655
URL: http://svn.freebsd.org/changeset/base/238655
Log:
MFC r238550:
Fix a refcount bug when freeing an association.
While there: Change code to be consistent.
Discussed with: rrs
Approved by: re (kib)
Modified:
stable/9/sys/netinet/sctp_pcb.c
stable/9/sys/netinet/sctputil.c
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/netinet/sctp_pcb.c
==============================================================================
--- stable/9/sys/netinet/sctp_pcb.c Fri Jul 20 08:36:53 2012
(r238654)
+++ stable/9/sys/netinet/sctp_pcb.c Fri Jul 20 09:49:50 2012
(r238655)
@@ -4984,6 +4984,7 @@ sctp_free_assoc(struct sctp_inpcb *inp,
/* now clean up any chunks here */
TAILQ_FOREACH_SAFE(sp, &outs->outqueue, next, nsp) {
TAILQ_REMOVE(&outs->outqueue, sp, next);
+ sctp_free_spbufspace(stcb, asoc, sp);
if (sp->data) {
if (so) {
/* Still an open socket - report */
@@ -4994,19 +4995,14 @@ sctp_free_assoc(struct sctp_inpcb *inp,
sctp_m_freem(sp->data);
sp->data = NULL;
sp->tail_mbuf = NULL;
+ sp->length = 0;
}
}
if (sp->net) {
sctp_free_remote_addr(sp->net);
sp->net = NULL;
}
- sctp_free_spbufspace(stcb, asoc, sp);
- if (sp->holds_key_ref)
- sctp_auth_key_release(stcb, sp->auth_keyid,
SCTP_SO_LOCKED);
- /* Free the zone stuff */
- SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_strmoq), sp);
- SCTP_DECR_STRMOQ_COUNT();
- /* sa_ignore FREED_MEMORY */
+ sctp_free_a_strmoq(stcb, sp, SCTP_SO_LOCKED);
}
}
/* sa_ignore FREED_MEMORY */
Modified: stable/9/sys/netinet/sctputil.c
==============================================================================
--- stable/9/sys/netinet/sctputil.c Fri Jul 20 08:36:53 2012
(r238654)
+++ stable/9/sys/netinet/sctputil.c Fri Jul 20 09:49:50 2012
(r238655)
@@ -3774,6 +3774,8 @@ sctp_report_all_outbound(struct sctp_tcb
if (sp->data) {
sctp_m_freem(sp->data);
sp->data = NULL;
+ sp->tail_mbuf = NULL;
+ sp->length = 0;
}
}
if (sp->net) {
@@ -4887,7 +4889,7 @@ sctp_release_pr_sctp_chunk(struct sctp_t
/*
* Pull any data to free up the SB
* and allow sender to "add more"
- * whilc we will throw away :-)
+ * while we will throw away :-)
*/
sctp_free_spbufspace(stcb, &stcb->asoc,
sp);
@@ -4895,9 +4897,9 @@ sctp_release_pr_sctp_chunk(struct sctp_t
do_wakeup_routine = 1;
sp->some_taken = 1;
sctp_m_freem(sp->data);
- sp->length = 0;
sp->data = NULL;
sp->tail_mbuf = NULL;
+ sp->length = 0;
}
break;
}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
