From owner-svn-src-head@FreeBSD.ORG  Tue Jul 10 13:17:33 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F01511065672;
	Tue, 10 Jul 2012 13:17:32 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DB7DF8FC18;
	Tue, 10 Jul 2012 13:17:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6ADHW21083736;
	Tue, 10 Jul 2012 13:17:32 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6ADHWhE083734;
	Tue, 10 Jul 2012 13:17:32 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <201207101317.q6ADHWhE083734@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 10 Jul 2012 13:17:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238346 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jul 2012 13:17:33 -0000

Author: emaste
Date: Tue Jul 10 13:17:32 2012
New Revision: 238346
URL: http://svn.freebsd.org/changeset/base/238346

Log:
  Plug potential mbuf leak when bridging fragments
  
  If an error occurs when transmitting one mbuf in a chain of fragments,
  free the subsequent fragments instead of leaking them.
  
  Sponsored by:   ADARA Networks

Modified:
  head/sys/net/if_bridge.c

Modified: head/sys/net/if_bridge.c
==============================================================================
--- head/sys/net/if_bridge.c	Tue Jul 10 08:31:28 2012	(r238345)
+++ head/sys/net/if_bridge.c	Tue Jul 10 13:17:32 2012	(r238346)
@@ -1813,6 +1813,8 @@ bridge_enqueue(struct bridge_softc *sc, 
 
 		if (err == 0)
 			err = dst_ifp->if_transmit(dst_ifp, m);
+		else
+			m_freem(m);
 	}
 
 	if (err == 0) {