From owner-svn-src-head@freebsd.org  Mon Sep 25 19:49:58 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 4E634E22C26;
 Mon, 25 Sep 2017 19:49:58 +0000 (UTC)
 (envelope-from tsoome@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 104A066673;
 Mon, 25 Sep 2017 19:49:57 +0000 (UTC)
 (envelope-from tsoome@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8PJnvTL022673;
 Mon, 25 Sep 2017 19:49:57 GMT (envelope-from tsoome@FreeBSD.org)
Received: (from tsoome@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8PJnvEK022672;
 Mon, 25 Sep 2017 19:49:57 GMT (envelope-from tsoome@FreeBSD.org)
Message-Id: <201709251949.v8PJnvEK022672@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tsoome set sender to
 tsoome@FreeBSD.org using -f
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Mon, 25 Sep 2017 19:49:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r323991 - head/sys/boot/efi/libefi
X-SVN-Group: head
X-SVN-Commit-Author: tsoome
X-SVN-Commit-Paths: head/sys/boot/efi/libefi
X-SVN-Commit-Revision: 323991
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: Mon, 25 Sep 2017 19:49:58 -0000

Author: tsoome
Date: Mon Sep 25 19:49:56 2017
New Revision: 323991
URL: https://svnweb.freebsd.org/changeset/base/323991

Log:
  libefi: efipart_floppy() will should not pass acpi pointer if the HID test fails
  
  The current efipart_floppy() implementation is leaking the acpi pointer.

Modified:
  head/sys/boot/efi/libefi/efipart.c

Modified: head/sys/boot/efi/libefi/efipart.c
==============================================================================
--- head/sys/boot/efi/libefi/efipart.c	Mon Sep 25 19:33:32 2017	(r323990)
+++ head/sys/boot/efi/libefi/efipart.c	Mon Sep 25 19:49:56 2017	(r323991)
@@ -181,7 +181,7 @@ efipart_inithandles(void)
 static ACPI_HID_DEVICE_PATH *
 efipart_floppy(EFI_DEVICE_PATH *node)
 {
-	ACPI_HID_DEVICE_PATH *acpi = NULL;
+	ACPI_HID_DEVICE_PATH *acpi;
 
 	if (DevicePathType(node) == ACPI_DEVICE_PATH &&
 	    DevicePathSubType(node) == ACPI_DP) {
@@ -192,7 +192,7 @@ efipart_floppy(EFI_DEVICE_PATH *node)
 			return (acpi);
 		}
 	}
-	return (acpi);
+	return (NULL);
 }
 
 /*