From owner-freebsd-pf@FreeBSD.ORG  Wed Feb 25 16:45:53 2009
Return-Path: <owner-freebsd-pf@FreeBSD.ORG>
Delivered-To: freebsd-pf@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 99849106575C
	for <freebsd-pf@freebsd.org>; Wed, 25 Feb 2009 16:45:53 +0000 (UTC)
	(envelope-from beck@ualberta.ca)
Received: from bofh.cns.ualberta.ca (bofh.cns.ualberta.ca [129.128.11.10])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BEA28FC1D
	for <freebsd-pf@freebsd.org>; Wed, 25 Feb 2009 16:45:53 +0000 (UTC)
	(envelope-from beck@ualberta.ca)
Received: from bofh.cns.ualberta.ca (beck@localhost.cns.ualberta.ca
	[127.0.0.1])
	by bofh.cns.ualberta.ca (8.14.3/8.14.0) with ESMTP id n1PGjqal003111
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 25 Feb 2009 09:45:52 -0700 (MST)
Received: (from beck@localhost)
	by bofh.cns.ualberta.ca (8.14.3/8.14.0/Submit) id n1PGjqUv016232;
	Wed, 25 Feb 2009 09:45:52 -0700 (MST)
X-Authentication-Warning: bofh.cns.ualberta.ca: beck set sender to
	beck@ualberta.ca using -f
Date: Wed, 25 Feb 2009 09:45:52 -0700
From: Bob Beck <beck@ualberta.ca>
To: Bob Beck <beck@ualberta.ca>
Message-ID: <20090225164552.GW15982@bofh.cns.ualberta.ca>
References: <9e20d71e0902250435y6e090fb0rc138233242fe7d60@mail.gmail.com>
	<200902251442.43794.max@love2party.net>
	<20090225155156.GN15982@bofh.cns.ualberta.ca>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20090225155156.GN15982@bofh.cns.ualberta.ca>
User-Agent: Mutt/1.5.18 (2008-05-17)
Cc: samm@os2.kiev.ua, Artis Caune <artis.caune@gmail.com>,
	freebsd-pf@freebsd.org
Subject: Re: openbsd spamd is leaking memory?
X-BeenThere: freebsd-pf@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Technical discussion and general questions about packet filter
	\(pf\)" <freebsd-pf.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-pf>,
	<mailto:freebsd-pf-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-pf>
List-Post: <mailto:freebsd-pf@freebsd.org>
List-Help: <mailto:freebsd-pf-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-pf>,
	<mailto:freebsd-pf-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Feb 2009 16:45:53 -0000

* Bob Beck <beck@ualberta.ca> [2009-02-25 08:52]:
> 
> 
> * Max Laier <max@love2party.net> [2009-02-25 06:43]:
> > Hello Artis,
> > 
> > looks like a valid catch to me.  I'm CC'ing the upstream maintainer (Bob, 
> > that's you, right?)  From a quick glance there is also a minor leak in 
> > readsuffixlists in the goto bad case.
> 
> 	Yeah you're right max, in fact there are three possibilities for 
> a slow leak.. try this:
> 

actually, try this - dropped a ! in the earlier one. sorry :)

	-Bob

Index: grey.c
===================================================================
RCS file: /cvs/src/libexec/spamd/grey.c,v
retrieving revision 1.45
diff -u grey.c
--- grey.c	7 Dec 2008 21:12:52 -0000	1.45
+++ grey.c	25 Feb 2009 16:33:57 -0000
@@ -315,8 +315,11 @@
 	size_t len;
 	struct mail_addr *m;
 
-	while (!SLIST_EMPTY(&match_suffix))
+	while (!SLIST_EMPTY(&match_suffix)) {
+		m = SLIST_FIRST(&match_suffix);	  
 		SLIST_REMOVE_HEAD(&match_suffix, entry);
+		free(m);
+	}
 	if ((fp = fopen(alloweddomains_file, "r")) != NULL) {
 		while ((buf = fgetln(fp, &len))) {
 			if (buf[len-1] == '\n')
@@ -337,8 +340,11 @@
 	}
 	return;
 bad:
-	while (!SLIST_EMPTY(&match_suffix))
+	while (!SLIST_EMPTY(&match_suffix)) {
+	  	m = SLIST_FIRST(&match_suffix);
 		SLIST_REMOVE_HEAD(&match_suffix, entry);
+		free(m);
+	}
 }
 
 void
@@ -512,6 +518,7 @@
 		dbc->act = 0;
 		dbc->dsiz = 0;
 		SLIST_REMOVE_HEAD(&db_changes, entry);
+		free(dbc);
 
 	}
 	return(ret);
@@ -737,8 +744,8 @@
 		if (r)
 			goto bad;
 		if (debug)