Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Oct 2019 19:13:36 +0000 (UTC)
From:      Conrad Meyer <cem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r353020 - head/sys/dev/nvdimm
Message-ID:  <201910021913.x92JDaa8057650@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cem
Date: Wed Oct  2 19:13:35 2019
New Revision: 353020
URL: https://svnweb.freebsd.org/changeset/base/353020

Log:
  nvdimm: Fix error path mis-free
  
  Regression introduced in r343629 when malloc result was renamed from spa to
  spa_mapping and the 'spa' name was instead used to iterate a table, but the
  free() target was not updated.
  
  Reviewed by:	kib, scottph
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D21871

Modified:
  head/sys/dev/nvdimm/nvdimm_acpi.c

Modified: head/sys/dev/nvdimm/nvdimm_acpi.c
==============================================================================
--- head/sys/dev/nvdimm/nvdimm_acpi.c	Wed Oct  2 17:18:18 2019	(r353019)
+++ head/sys/dev/nvdimm/nvdimm_acpi.c	Wed Oct  2 19:13:35 2019	(r353020)
@@ -141,7 +141,7 @@ nvdimm_root_create_spas(struct nvdimm_root_dev *dev, A
 		error = nvdimm_spa_init(spa_mapping, *spa, spa_type);
 		if (error != 0) {
 			nvdimm_spa_fini(spa_mapping);
-			free(spa, M_NVDIMM_ACPI);
+			free(spa_mapping, M_NVDIMM_ACPI);
 			break;
 		}
 		nvdimm_create_namespaces(spa_mapping, nfitbl);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910021913.x92JDaa8057650>