From owner-svn-src-all@freebsd.org  Fri Dec  8 19:50:07 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7744AE8D4C8;
 Fri,  8 Dec 2017 19:50:07 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 41626116B;
 Fri,  8 Dec 2017 19:50:07 +0000 (UTC)
 (envelope-from shurd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vB8Jo6aE090283;
 Fri, 8 Dec 2017 19:50:06 GMT (envelope-from shurd@FreeBSD.org)
Received: (from shurd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vB8Jo67f090282;
 Fri, 8 Dec 2017 19:50:06 GMT (envelope-from shurd@FreeBSD.org)
Message-Id: <201712081950.vB8Jo67f090282@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: shurd set sender to
 shurd@FreeBSD.org using -f
From: Stephen Hurd <shurd@FreeBSD.org>
Date: Fri, 8 Dec 2017 19:50:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326706 - head/sys/net
X-SVN-Group: head
X-SVN-Commit-Author: shurd
X-SVN-Commit-Paths: head/sys/net
X-SVN-Commit-Revision: 326706
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Dec 2017 19:50:07 -0000

Author: shurd
Date: Fri Dec  8 19:50:06 2017
New Revision: 326706
URL: https://svnweb.freebsd.org/changeset/base/326706

Log:
  Free mbuf chain when m_dup fails
  
  Fix memory leak where mbuf chain wasn't free()d if iflib_ether_pad()
  has a failure in m_dup().
  
  Reported by:	"Ryan Stone" <rysto32@gmail.com>
  Sponsored by:	Limelight Networks

Modified:
  head/sys/net/iflib.c

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c	Fri Dec  8 19:26:25 2017	(r326705)
+++ head/sys/net/iflib.c	Fri Dec  8 19:50:06 2017	(r326706)
@@ -3125,6 +3125,7 @@ iflib_ether_pad(device_t dev, struct mbuf **m_head, ui
 	if (!M_WRITABLE(*m_head)) {
 		new_head = m_dup(*m_head, M_NOWAIT);
 		if (new_head == NULL) {
+			m_freem(*m_head);
 			device_printf(dev, "cannot pad short frame, m_dup() failed");
 			return ENOMEM;
 		}