From owner-svn-src-stable-10@freebsd.org  Fri May 13 09:49:53 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@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 4EC61B37771;
 Fri, 13 May 2016 09:49:53 +0000 (UTC)
 (envelope-from ngie@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 2097A1B38;
 Fri, 13 May 2016 09:49:53 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4D9nqfb088428;
 Fri, 13 May 2016 09:49:52 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4D9nqNR088427;
 Fri, 13 May 2016 09:49:52 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605130949.u4D9nqNR088427@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 13 May 2016 09:49:52 +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: r299649 - stable/10/lib/libkvm
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 09:49:53 -0000

Author: ngie
Date: Fri May 13 09:49:52 2016
New Revision: 299649
URL: https://svnweb.freebsd.org/changeset/base/299649

Log:
  MFC r298842:
  
  Don't leak PML4 in _amd64_initvtop(..) if kvm_read2(..) fails
  
  CID: 1341474

Modified:
  stable/10/lib/libkvm/kvm_amd64.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/lib/libkvm/kvm_amd64.c
==============================================================================
--- stable/10/lib/libkvm/kvm_amd64.c	Fri May 13 09:46:23 2016	(r299648)
+++ stable/10/lib/libkvm/kvm_amd64.c	Fri May 13 09:49:52 2016	(r299649)
@@ -200,6 +200,7 @@ _kvm_initvtop(kvm_t *kd)
 	PML4 = _kvm_malloc(kd, PAGE_SIZE);
 	if (kvm_read(kd, pa, PML4, PAGE_SIZE) != PAGE_SIZE) {
 		_kvm_err(kd, kd->program, "cannot read KPML4phys");
+		free(PML4);
 		return (-1);
 	}
 	kd->vmst->PML4 = PML4;