From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D6896275842; Sun, 1 Jun 2025 23:28:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748820516; cv=none; b=D6DrBvjE5XUjDV3dSgkOA8wv+Q9iX1AUVPHWDmVm68gZ48DHzTPgSv/bZIJZpGNgcbvt7sKvYR7enW4CAzCRza36FKvn3g+q9sE0m0BpjP5GZvLgLR03Y+hvEMn9zigXmc7EwjJ5DfsCMSmMlhjld7Icyel3x41CJlb5yR/9zWA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748820516; c=relaxed/simple; bh=JrFiIa0aVNDgppSre2V1u5GhTFUo3wKv9edxo9b/NtM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gjvjX7hA3AGW0Mpztr0X69Fwu16J9dzNMDpmZ2b0ekljtRNVtdFlz//frU2jRG9vLZAk9t+z8/50KXSMo9Pa3LLF5gIl5ojawiwHNpPrpKjJiBYMn78FDgVSuT2jXQn0jeCjWBlikCumHbrVPuFLGz68VCRksrgIa1dkKhWvV/I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lzm8GlPH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lzm8GlPH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE9E7C4CEEE; Sun, 1 Jun 2025 23:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748820516; bh=JrFiIa0aVNDgppSre2V1u5GhTFUo3wKv9edxo9b/NtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lzm8GlPHGKfosgeJVylmfz3ofrz59g8plWXk+LVlndsbA0OomRgoyTakAxJz2BnOR 4C9Y3OiKA1dBTKMTn1rYU28z8mngBJmR+ezByxIoXnajlpLHKCL539fCGIV2WBKzTi zSioYokrsJ3ovm+IxRXeOmNJi94ytcwWGdtphG65nRZZDwJVuMQaovfM2gCA+iLf6q vgj30Sm3v9nGHYY2o0Ba1IagvME51AuLQ+U4cQccsZUUDQhB/YLvUQ6E9wUxMYVLsG GBSys4u8MNYvxpMMM3qEKBWbl9RaO+dd8B2eJCDNRRaV7rH4h5SpSla8vK7JfXEDN3 CbeYlqx1DmmRw== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Armin Wolf , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.15 081/110] ACPI: bus: Bail out if acpi_kobj registration fails Date: Sun, 1 Jun 2025 19:24:03 -0400 Message-Id: <20250601232435.3507697-81-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250601232435.3507697-1-sashal@kernel.org> References: <20250601232435.3507697-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.15 Content-Transfer-Encoding: 8bit From: Armin Wolf [ Upstream commit 94a370fc8def6038dbc02199db9584b0b3690f1a ] The ACPI sysfs code will fail to initialize if acpi_kobj is NULL, together with some ACPI drivers. Follow the other firmware subsystems and bail out if the kobject cannot be registered. Signed-off-by: Armin Wolf Link: https://patch.msgid.link/20250518185111.3560-2-W_Armin@gmx.de Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- **YES** This commit should be backported to stable kernel trees. Here's the detailed analysis: **Bug Fix Nature**: The commit fixes a real bug where ACPI initialization continues silently even when `acpi_kobj` registration fails. This creates an inconsistent system state where ACPI sysfs functionality and some drivers that depend on `acpi_kobj` will fail later without clear indication of the root cause. **Code Change Analysis**: - Changes `pr_debug()` to `pr_err()` for better visibility of the failure - Returns `-ENOMEM` immediately when `kobject_create_and_add()` fails instead of continuing - The existing `kobject_put(acpi_kobj)` cleanup in the error path after `acpi_bus_init()` is already present **Comparison with Similar Commits**: This follows the exact pattern of Similar Commit #1 (Status: YES) which added `kobject_put()` cleanup. Both commits address resource management issues in the same function (`acpi_init`) and represent important bugfixes with minimal risk. **Risk Assessment**: - Very low risk - only affects the error path when kobject creation fails - Early failure is better than silent failure leading to confusing symptoms later - Change is contained to a single function with clear error handling - Consistent with how other firmware subsystems handle kobject registration failures **Stable Tree Criteria Met**: - Fixes important bug affecting system reliability - Minimal and contained change - No architectural modifications - Clear improvement in error handling and debugging The commit addresses a legitimate reliability issue where ACPI would continue initialization with a NULL `acpi_kobj`, leading to failures in dependent subsystems that would be harder to diagnose than an early, clear failure. drivers/acpi/bus.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 058910af82bca..c2ab2783303f2 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1446,8 +1446,10 @@ static int __init acpi_init(void) } acpi_kobj = kobject_create_and_add("acpi", firmware_kobj); - if (!acpi_kobj) - pr_debug("%s: kset create error\n", __func__); + if (!acpi_kobj) { + pr_err("Failed to register kobject\n"); + return -ENOMEM; + } init_prmt(); acpi_init_pcc(); -- 2.39.5