From 31f1c8fc84c850d73e74781126e12efceb50032b Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Wed, 2 Oct 2019 19:13:35 +0000 Subject: [PATCH] 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 --- sys/dev/nvdimm/nvdimm_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvdimm/nvdimm_acpi.c b/sys/dev/nvdimm/nvdimm_acpi.c index 1447c64fb34..db176e4a968 100644 --- a/sys/dev/nvdimm/nvdimm_acpi.c +++ b/sys/dev/nvdimm/nvdimm_acpi.c @@ -141,7 +141,7 @@ nvdimm_root_create_spas(struct nvdimm_root_dev *dev, ACPI_TABLE_NFIT *nfitbl) 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);