From owner-svn-src-head@freebsd.org Wed Oct 2 19:13:36 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 822161371D8; Wed, 2 Oct 2019 19:13:36 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46k5QS2wfqz3NWl; Wed, 2 Oct 2019 19:13:36 +0000 (UTC) (envelope-from cem@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4856F20B; Wed, 2 Oct 2019 19:13:36 +0000 (UTC) (envelope-from cem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x92JDaMV057651; Wed, 2 Oct 2019 19:13:36 GMT (envelope-from cem@FreeBSD.org) Received: (from cem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x92JDaa8057650; Wed, 2 Oct 2019 19:13:36 GMT (envelope-from cem@FreeBSD.org) Message-Id: <201910021913.x92JDaa8057650@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org using -f From: Conrad Meyer Date: Wed, 2 Oct 2019 19:13:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353020 - head/sys/dev/nvdimm X-SVN-Group: head X-SVN-Commit-Author: cem X-SVN-Commit-Paths: head/sys/dev/nvdimm X-SVN-Commit-Revision: 353020 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.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Oct 2019 19:13:36 -0000 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);