From owner-svn-src-all@freebsd.org  Thu May 19 20:51:49 2016
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 2B6D8B42F3B;
 Thu, 19 May 2016 20:51:49 +0000 (UTC)
 (envelope-from gonzo@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 F09FE18EE;
 Thu, 19 May 2016 20:51:48 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4JKpmfG005589;
 Thu, 19 May 2016 20:51:48 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4JKpmRU005588;
 Thu, 19 May 2016 20:51:48 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201605192051.u4JKpmRU005588@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Thu, 19 May 2016 20:51:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300230 - head/sys/boot/fdt
X-SVN-Group: head
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.22
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: Thu, 19 May 2016 20:51:49 -0000

Author: gonzo
Date: Thu May 19 20:51:47 2016
New Revision: 300230
URL: https://svnweb.freebsd.org/changeset/base/300230

Log:
  Fixed memory leak in FDT overlay handling code
  
  Free both overlay and new fdt before returning after fdt_open_into error
  PR:		209634
  Submitted by:	David Binderman

Modified:
  head/sys/boot/fdt/fdt_loader_cmd.c

Modified: head/sys/boot/fdt/fdt_loader_cmd.c
==============================================================================
--- head/sys/boot/fdt/fdt_loader_cmd.c	Thu May 19 20:08:16 2016	(r300229)
+++ head/sys/boot/fdt/fdt_loader_cmd.c	Thu May 19 20:51:47 2016	(r300230)
@@ -383,6 +383,8 @@ fdt_apply_overlays()
 	rv = fdt_open_into(fdtp, new_fdtp, new_fdtp_size);
 	if (rv != 0) {
 		printf("failed to open DTB blob for applying overlays\n");
+		free(new_fdtp);
+		free(overlay);
 		return;
 	}