From owner-svn-src-stable@freebsd.org  Sun Aug 20 19:21:07 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 3ACD2DE7B94;
 Sun, 20 Aug 2017 19:21:07 +0000 (UTC)
 (envelope-from delphij@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 09A9A6FD2C;
 Sun, 20 Aug 2017 19:21:06 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7KJL64b072149;
 Sun, 20 Aug 2017 19:21:06 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7KJL6XI072148;
 Sun, 20 Aug 2017 19:21:06 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201708201921.v7KJL6XI072148@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 20 Aug 2017 19:21:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r322725 - stable/10/sys/mips/atheros
X-SVN-Group: stable-10
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: stable/10/sys/mips/atheros
X-SVN-Commit-Revision: 322725
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Aug 2017 19:21:07 -0000

Author: delphij
Date: Sun Aug 20 19:21:06 2017
New Revision: 322725
URL: https://svnweb.freebsd.org/changeset/base/322725

Log:
  MFC r322527:
  
  Plug memory leak in arge_encap().
  
  Reported by:	Ilja Van Sprundel <ivansprundel ioactive.com>
  Submitted by:	Domagoj Stolfa <domagoj.stolfa gmail.com>
  Reviewed by:	adrian
  Approved by:	re (kib)

Modified:
  stable/10/sys/mips/atheros/if_arge.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/mips/atheros/if_arge.c
==============================================================================
--- stable/10/sys/mips/atheros/if_arge.c	Sun Aug 20 16:52:27 2017	(r322724)
+++ stable/10/sys/mips/atheros/if_arge.c	Sun Aug 20 19:21:06 2017	(r322725)
@@ -1111,6 +1111,7 @@ arge_encap(struct arge_softc *sc, struct mbuf **m_head
 		sc->stats.tx_pkts_unaligned++;
 		m = m_defrag(*m_head, M_NOWAIT);
 		if (m == NULL) {
+			m_freem(*m_head);
 			*m_head = NULL;
 			return (ENOBUFS);
 		}