From owner-svn-src-head@freebsd.org  Tue Aug 15 06:01:37 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 B64E0DE4DD8;
 Tue, 15 Aug 2017 06:01:37 +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 80E4C2022;
 Tue, 15 Aug 2017 06:01:37 +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 v7F61aJ5080918;
 Tue, 15 Aug 2017 06:01:36 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7F61aPS080917;
 Tue, 15 Aug 2017 06:01:36 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201708150601.v7F61aPS080917@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: Tue, 15 Aug 2017 06:01:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322527 - head/sys/mips/atheros
X-SVN-Group: head
X-SVN-Commit-Author: delphij
X-SVN-Commit-Paths: head/sys/mips/atheros
X-SVN-Commit-Revision: 322527
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Aug 2017 06:01:37 -0000

Author: delphij
Date: Tue Aug 15 06:01:36 2017
New Revision: 322527
URL: https://svnweb.freebsd.org/changeset/base/322527

Log:
  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
  MFC after:	3 days

Modified:
  head/sys/mips/atheros/if_arge.c

Modified: head/sys/mips/atheros/if_arge.c
==============================================================================
--- head/sys/mips/atheros/if_arge.c	Tue Aug 15 02:21:02 2017	(r322526)
+++ head/sys/mips/atheros/if_arge.c	Tue Aug 15 06:01:36 2017	(r322527)
@@ -1516,6 +1516,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);
 		}