From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795023612; b=YaR4YqotXejP2l+3Y9+WvUGc7E4d+wWuD+jRgWmdq/FSqUdILJck0K20yRTcLg/o1wkl xgEQZljo7+aeqJfGTMA6ilKZd2RxpykHtFwrui3VgEngGnk6cOXkuoCow7GIH+IYRy1Dj zf1h5TMvxsQ57O3ryfaxmw3LH5NBXPYFvMXKsH5sMmu7wcEid3AOSbyse7zj1zQC5aweY +mwTV99YS8zZ2NAbFj6R7S4Fx45a3Q9Nl9HiC2vBJ3kCsne834pyeXr335eYu30rHX8k3 cg3qlvRIY7e4OhmAcg+gAOAdS+7yhuMA9vRbxwiNuJ13mmOc5xiL7Pq3Tgdjb0fjNfg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795023612; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=pS5dAqWj93wqoBENGcvGvXOmzvMl1du0qCSO+rqujWk=; b=g9ibflsRouXcU4HsaYQ4mFM4GvjIih5WUkRAQHta/eEM0Y276edsVbEf0FB2fPSwsOjI mhdMTXzXaU2xJAKGNITE4XiehmbaREStV9+hGoPvtjD2Hejf7neirW2+T4pG9je3dKe9m O3YCNlUPld23V8RkbfDzyBnN8V+kSZ/6Y4zKVbv4xMeoEbTytVC6MUCaf3qykGqsF8o73 1hOhe/Asd5ObUR4GgQG8l8qGywLuCE9zfSmLQAi5k01DxY8ziNbVgQuJ9/bQjwLpu7DxW VPsmiqnGwm9JOSzkQnfMzXGf0LXmDLLC1g8FGdw51uIZFJA8++QtK40VKAwBwMwgcRg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=1m7dLRxl; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F3D6606A31C; Wed, 18 Nov 2026 17:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=1m7dLRxl Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E38B1F000C4; Wed, 18 Nov 2026 17:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795023611; bh=pS5dAqWj93wqoBENGcvGvXOmzvMl1du0qCSO+rqujWk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=1m7dLRxls4oysEEUg34Tvv9bvlzbVsEEae92k7cWKuVYca1vjHr+IsLSeEUfl3oQl EJWvbdu5l5GdgIy1UtIcFEcW6wKGSzjBI9TdVMqgaP8tnPVQlySv7L6v6pOwVnjrK2 +4JdDxGCBOtjSiCqY9n0jl5E5b+5Ls1und+3fNUE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.18 0390/2151] ACPI: glue: Carry out companion lookup under bus_type_sem Date: Wed, 18 Nov 2026 15:35:25 +0100 Message-ID: <20261118150136.274381274@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150121.603863898@linuxfoundation.org> References: <20261118150121.603863898@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rafael J. Wysocki [ Upstream commit c94619c8a5b5d3b980433d247ac87a2d1c827cb6 ] When acpi_device_notify() looks up an ACPI companion for the given device, it invokes callbacks from struct acpi_bus_type() without synchronization which may lead to a use-after-free if the driver module containing those callbacks is unloaded at the same time. Address this by holding bus_type_sem throughout the entire ACPI companion lookup and the execution of the .setup() callback in struct acpi_bus_type (if present) instead of dropping the semaphore (prematurely) after finding a matching struct acpi_bus_type. For this purpose, rename acpi_get_bus_type() to acpi_companion_lookup(), make it return a struct acpi_device pointer, and move the relevant code from acpi_device_notify() to it. Also notice that the only case in which the .bind() callback from an ACPI scan handler may need to be invoked is when the given device is a platform one, so adjust acpi_device_notify() accordingly and drop the "done" label that is not used any more from it. Fixes: 2ef5236660b6 ("ACPI: glue: Look for ACPI bus type only if ACPI companion is not known") Signed-off-by: Rafael J. Wysocki Link: https://patch.msgid.link/3089807.e9J7NaK4W3@rafael.j.wysocki Signed-off-by: Sasha Levin --- drivers/acpi/glue.c | 61 +++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 6c81ac1ff28e5..271eac337506a 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -59,19 +59,34 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type) } EXPORT_SYMBOL_GPL(unregister_acpi_bus_type); -static struct acpi_bus_type *acpi_get_bus_type(struct device *dev) +static struct acpi_device *acpi_companion_lookup(struct device *dev) { - struct acpi_bus_type *tmp, *ret = NULL; + struct acpi_bus_type *type; - down_read(&bus_type_sem); - list_for_each_entry(tmp, &bus_type_list, list) { - if (tmp->match(dev)) { - ret = tmp; - break; + guard(rwsem_read)(&bus_type_sem); + + list_for_each_entry(type, &bus_type_list, list) { + struct acpi_device *adev; + + if (!type->match(dev)) + continue; + + adev = type->find_companion(dev); + if (!adev) { + dev_dbg(dev, "ACPI companion not found\n"); + return NULL; } + if (acpi_bind_one(dev, adev)) { + dev_dbg(dev, "Binding to ACPI companion failed\n"); + return NULL; + } + if (type->setup) + type->setup(dev); + + return adev; } - up_read(&bus_type_sem); - return ret; + + return NULL; } #define FIND_CHILD_MIN_SCORE 1 @@ -360,40 +375,22 @@ void acpi_device_notify(struct device *dev) ret = acpi_bind_one(dev, NULL); if (ret) { - struct acpi_bus_type *type = acpi_get_bus_type(dev); - - if (!type) + adev = acpi_companion_lookup(dev); + if (!adev) return; - - adev = type->find_companion(dev); - if (!adev) { - dev_dbg(dev, "ACPI companion not found\n"); - return; - } - ret = acpi_bind_one(dev, adev); - if (ret) { - dev_dbg(dev, "Binding to ACPI companion failed\n"); - return; - } - if (type->setup) { - type->setup(dev); - goto done; - } } else { adev = ACPI_COMPANION(dev); if (dev_is_pci(dev)) { pci_acpi_setup(dev, adev); - goto done; } else if (dev_is_platform(dev)) { acpi_configure_pmsi_domain(dev); + + if (adev->handler && adev->handler->bind) + adev->handler->bind(dev); } } - if (adev->handler && adev->handler->bind) - adev->handler->bind(dev); - -done: dev_dbg(dev, "Bound to ACPI device %s\n", acpi_dev_name(adev)); } -- 2.53.0