svn commit: r220203 - head/sys/netinet/ipfw

Andrey V. Elsukov ae at FreeBSD.org
Thu Mar 31 15:10:42 UTC 2011


Author: ae
Date: Thu Mar 31 15:10:41 2011
New Revision: 220203
URL: http://svn.freebsd.org/changeset/base/220203

Log:
  Fix a memory leak. Memory that is allocated for schedulers hash table
  was not freed.
  
  PR:		kern/156083
  MFC after:	1 week

Modified:
  head/sys/netinet/ipfw/ip_dummynet.c

Modified: head/sys/netinet/ipfw/ip_dummynet.c
==============================================================================
--- head/sys/netinet/ipfw/ip_dummynet.c	Thu Mar 31 14:44:00 2011	(r220202)
+++ head/sys/netinet/ipfw/ip_dummynet.c	Thu Mar 31 15:10:41 2011	(r220203)
@@ -748,9 +748,10 @@ schk_delete_cb(void *obj, void *arg)
 #endif
 	fsk_detach_list(&s->fsk_list, arg ? DN_DESTROY : 0);
 	/* no more flowset pointing to us now */
-	if (s->sch.flags & DN_HAVE_MASK)
+	if (s->sch.flags & DN_HAVE_MASK) {
 		dn_ht_scan(s->siht, si_destroy, NULL);
-	else if (s->siht)
+		dn_ht_free(s->siht, 0);
+	} else if (s->siht)
 		si_destroy(s->siht, NULL);
 	if (s->profile) {
 		free(s->profile, M_DUMMYNET);


More information about the svn-src-head mailing list