From owner-p4-projects@FreeBSD.ORG  Wed Jan 23 20:01:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 830E616A41A; Wed, 23 Jan 2008 20:01:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 481E616A418
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 20:01:29 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 424D313C44B
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 20:01:29 +0000 (UTC)
	(envelope-from andre@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m0NK1Tvj080727
	for <perforce@freebsd.org>; Wed, 23 Jan 2008 20:01:29 GMT
	(envelope-from andre@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0NK1TEd080724
	for perforce@freebsd.org; Wed, 23 Jan 2008 20:01:29 GMT
	(envelope-from andre@freebsd.org)
Date: Wed, 23 Jan 2008 20:01:29 GMT
Message-Id: <200801232001.m0NK1TEd080724@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	andre@freebsd.org using -f
From: Andre Oppermann <andre@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133940 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Jan 2008 20:01:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=133940

Change 133940 by andre@andre_flirtbox on 2008/01/23 20:00:45

	Fix memory leak when length is zero.  We must always consume
	the mbuf.  Add commment to note this.

Affected files ...

.. //depot/projects/tcp_reass/netinet/tcp_reass.c#14 edit

Differences ...

==== //depot/projects/tcp_reass/netinet/tcp_reass.c#14 (text+ko) ====

@@ -156,6 +156,9 @@
 
 /*
  * Insert segments into the reassembly queue.
+ *
+ * NB: We must always consume the mbuf.  Either by appeding it to
+ * the queue or by freeing it.
  */
 int
 tcp_reass(struct tcpcb *tp, struct tcphdr *th, int *tlenp, struct mbuf *m)
@@ -190,8 +193,10 @@
 	}
 
 	/* XXX: should not happen, but does for some reason. */
-	if (*tlenp == 0)
+	if (*tlenp == 0) {
+		m_freem(m);
 		return (0);
+	}
 
 	KASSERT(*tlenp > 0,
 	    ("%s: segment doesn't contain any data", __func__));