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 441E8310645 for ; Fri, 10 Jul 2026 14:00:26 +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=1783692027; cv=none; b=AgW4HTZz/Qh83sCvdv5KaQJAH8wXXtFG9D11WyYdAx+FsrMI7/WXosrHNpvjlUGKCotvg58oA5IZhZzDgBYM249D8JKNN50LCPMeT2zmWc2djB9zmlFYEuUGwjdWLpxA0IeD7NAcPl0D9KfFDmmUAPu7N400Ts/vpq/aMnV1JNc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783692027; c=relaxed/simple; bh=0htVyoAYexKEIHFaePjlGenvBwaFicJhDvlsgKKEzdI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nFo7GcRvKv6sA2mUHeOfuU709C0SP6dcViz4Yx/azcHvASTbDXwsC8bpmu8kUzZwH0cXgFcoSepVwfPRzZymOdVZFzR7MwgwWrybjAG2MpjSUgxOQci1mHYvcPus0cE/FAl2VbVH+VJn2CugM9QckcLWH0dD9sGvPQjLVo7e/HI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XdEnUUoc; 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="XdEnUUoc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE0551F00A3D; Fri, 10 Jul 2026 14:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783692026; bh=f8vcqLb/jCPMg7lcVLaoUN1C2jLqpFDm8nR01WFIwwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XdEnUUoclMBEBonYmBYz/R4Rk/Hp7fFwE43oa7iaS/9uX1ZL56e9lfAV8HaHiIpzA iDAxm+qmXFlSqY/n2wDvA4Xd3M4ebeMx8cTvXetNCEnrsgzeQzNYi/pxHBGUdo1y6T UNbckYsgORLOrazgAR930viu2/S45grWCzo4Otew1wH7268I+F1Qth4kNd77SwHIjr l+H3TOHyrlHceMRqw9wafLy9KEAEtjgMT60ib2J7qQyJjso9HEHfpQug8zzg8nUc6k Qkn1upcBEpBAH0JiPB9nbqiJ2uOEm26LUaQju06n8xbUgqgf0YEgn2m/Cei28LlhlK xP1AgT7FXTjBg== From: Sasha Levin To: stable@vger.kernel.org Cc: "Rafael J. Wysocki" , Dave Jiang , Sasha Levin Subject: [PATCH 6.6.y] ACPI: NFIT: core: Fix acpi_nfit_init() error cleanup Date: Fri, 10 Jul 2026 10:00:24 -0400 Message-ID: <20260710140024.103597-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026070916-rerun-roundness-78d4@gregkh> References: <2026070916-rerun-roundness-78d4@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 5a1ced5bf7f6fa..60c4d390e44dad 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -3067,6 +3067,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) @@ -3307,7 +3309,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 @@ -3322,6 +3327,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 @@ -3399,9 +3405,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) @@ -3485,6 +3496,7 @@ static struct acpi_driver acpi_nfit_driver = { .ids = acpi_nfit_ids, .ops = { .add = acpi_nfit_add, + .remove = acpi_nfit_remove, }, }; -- 2.53.0