From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3DF9313E00 for ; Fri, 10 Jul 2026 13:34:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783690483; cv=none; b=VBozcybfgD0AwV/M3ie5x1YhzVvPDg0b2qMHQ5nru1hLoXdlqZg592ZH7SXNh+8mquDRvSaSlrwIDTppx4oHCYQ1JWesRvYhyyh574iqA//QF7XiYRZpgntXmfuJgdNmyt5wthIPM9GHgtUqTvi/GRIDUdC39YlE7hZIkGczSJs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783690483; c=relaxed/simple; bh=Pzj3KLRrOnB+BZJJdaobgFPSgFN/oYJnjqO5Kc3uCm4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iIMYz10aFy3+2M6QxD7MIr8t2VqygXRSeRZtWVFHu+q0OTvrE+Y/phEz5tDUzW5A9TlPB2zh6pGddteZu4brbwtB/Pa9ZEUvSAQLpwMfbmU96eND7QB5te7RESjJlqkNFXPKsyLFbKWictEK/g3U5v3wyyHq7HC/mcYOxV8h8lk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WdXSXvxJ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WdXSXvxJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18D071F000E9; Fri, 10 Jul 2026 13:34:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783690482; bh=Po5sowEd2D40BtIqb0Dg9RezSmU/uI7W63PWfQNiqjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WdXSXvxJ3hoxVaiidYtE1cOpe0beVTumLQ9tx7n6Ms5ThC3HQmlQ4mlJJ1bz6g6PF Zgvs18gleMInhoVUiDU2Zc/lyf+0gwH1YsaqfHoLMBTa+lbWeT54ITyex1hkouXMQD SuHRhh5HCIjZIt81PniVa8xkUiXEgJc5uM2/TVz6D+ypEHCyK4MzlhFrvGao2CsaYh JnPMiHwJ0zahD0+h5RAHVp/4nLm3KcuWXPr6NfYzGed6PzT65LRAdbpB3HjK5rG/ZZ nhh0C74A3CJ88uLvN7t2shvbFQGxXITp8wrenw6oLmQu+oej0wJ+LKexodfsk1bndP A8NpRqIgozlcg== From: Sasha Levin To: stable@vger.kernel.org Cc: "Rafael J. Wysocki" , Dave Jiang , Sasha Levin Subject: [PATCH 6.12.y] ACPI: NFIT: core: Fix acpi_nfit_init() error cleanup Date: Fri, 10 Jul 2026 09:34:39 -0400 Message-ID: <20260710133439.82432-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026070916-kilometer-humorless-c4b7@gregkh> References: <2026070916-kilometer-humorless-c4b7@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Rafael J. Wysocki" [ Upstream commit 38bf27511ef41bffebd157ec3eba41fc89ba59cd ] If acpi_nfit_init() fails after adding the acpi_desc object to the acpi_descs list, that object is never removed from that list because the acpi_nfit_shutdown() devm action is not added for the NFIT device in that case. Next, the acpi_nfit_init() failure causes acpi_nfit_probe() to fail, the acpi_desc object is freed, and a dangling pointer is left behind in the acpi_descs. Any subsequent ACPI Machine Check Exception will trigger nfit_handle_mce() which iterates over acpi_descs and so a use-after-free will occur. Moreover, if acpi_nfit_probe() returns 0 after installing a notify handler for the NFIT device and without allocating the acpi_desc object and setting the NFIT device's driver data pointer, the acpi_desc object will be allocated by acpi_nfit_update_notify() and acpi_nfit_init() will be called to initialize it. Regardless of whether or not acpi_nfit_init() fails in that case, the acpi_nfit_shutdown() devm action is not added for the NFIT device and acpi_desc is never removed from the acpi_descs list. If the acpi_desc object is freed subsequently on driver removal, any subsequent ACPI MCE will lead to a use-after-free like in the previous case. To address the first issue mentioned above, make acpi_nfit_probe() call acpi_nfit_shutdown() directly on acpi_nfit_init() failures and to address the other one, add a remove callback to the driver and make it call acpi_nfit_shutdown(). Also, since it is now possible to pass NULL to acpi_nfit_shutdown() or the acpi_desc object passed to it may not have been initialized, add checks against NULL for acpi_desc and its nvdimm_bus field to that function and make acpi_nfit_unregister() clear the latter after unregistering the NVDIMM bus. Fixes: a61fe6f7902e ("nfit, tools/testing/nvdimm: unify common init for acpi_nfit_desc") Fixes: fbabd829fe76 ("acpi, nfit: fix module unload vs workqueue shutdown race") Signed-off-by: Rafael J. Wysocki Cc: All applicable Reviewed-by: Dave Jiang Link: https://patch.msgid.link/1963615.tdWV9SEqCh@rafael.j.wysocki Signed-off-by: Sasha Levin --- drivers/acpi/nfit/core.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 3eb56b77cb6d93..30b5d30bbd44a1 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3061,6 +3061,8 @@ static void acpi_nfit_unregister(void *data) struct acpi_nfit_desc *acpi_desc = data; nvdimm_bus_unregister(acpi_desc->nvdimm_bus); + /* The nvdimm_bus object may have been freed, so clear the pointer. */ + acpi_desc->nvdimm_bus = NULL; } int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void *data, acpi_size sz) @@ -3301,7 +3303,10 @@ static void acpi_nfit_remove_notify_handler(void *data) void acpi_nfit_shutdown(void *data) { struct acpi_nfit_desc *acpi_desc = data; - struct device *bus_dev = to_nvdimm_bus_dev(acpi_desc->nvdimm_bus); + struct device *bus_dev; + + if (!acpi_desc || !acpi_desc->nvdimm_bus) + return; /* * Destruct under acpi_desc_lock so that nfit_handle_mce does not @@ -3316,6 +3321,7 @@ void acpi_nfit_shutdown(void *data) mutex_unlock(&acpi_desc->init_mutex); cancel_delayed_work_sync(&acpi_desc->dwork); + bus_dev = to_nvdimm_bus_dev(acpi_desc->nvdimm_bus); /* * Bounce the nvdimm bus lock to make sure any in-flight * acpi_nfit_ars_rescan() submissions have had a chance to @@ -3393,9 +3399,14 @@ static int acpi_nfit_add(struct acpi_device *adev) sz - sizeof(struct acpi_table_nfit)); if (rc) - return rc; + acpi_nfit_shutdown(acpi_desc); - return devm_add_action_or_reset(dev, acpi_nfit_shutdown, acpi_desc); + return rc; +} + +static void acpi_nfit_remove(struct acpi_device *adev) +{ + acpi_nfit_shutdown(dev_get_drvdata(&adev->dev)); } static void acpi_nfit_update_notify(struct device *dev, acpi_handle handle) @@ -3479,6 +3490,7 @@ static struct acpi_driver acpi_nfit_driver = { .ids = acpi_nfit_ids, .ops = { .add = acpi_nfit_add, + .remove = acpi_nfit_remove, }, }; -- 2.53.0