From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>,
"Rafael J . Wysocki" <rafael.j.wysocki@intel.com>,
Sasha Levin <sashal@kernel.org>,
rafael@kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH AUTOSEL 6.13 04/21] powercap: call put_device() on an error path in powercap_register_control_type()
Date: Mon, 10 Feb 2025 20:29:37 -0500 [thread overview]
Message-ID: <20250211012954.4096433-4-sashal@kernel.org> (raw)
In-Reply-To: <20250211012954.4096433-1-sashal@kernel.org>
From: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
[ Upstream commit 93c66fbc280747ea700bd6199633d661e3c819b3 ]
powercap_register_control_type() calls device_register(), but does not
release the refcount of the device when it fails.
Call put_device() before returning an error to balance the refcount.
Since the kfree(control_type) will be done by powercap_release(), remove
the lines in powercap_register_control_type() before returning the error.
This bug was found by an experimental verifier that I am developing.
Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
Link: https://patch.msgid.link/20250110010554.1583411-1-joe@pf.is.s.u-tokyo.ac.jp
[ rjw: Changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/powercap/powercap_sys.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
index 52c32dcbf7d84..4112a00973382 100644
--- a/drivers/powercap/powercap_sys.c
+++ b/drivers/powercap/powercap_sys.c
@@ -627,8 +627,7 @@ struct powercap_control_type *powercap_register_control_type(
dev_set_name(&control_type->dev, "%s", name);
result = device_register(&control_type->dev);
if (result) {
- if (control_type->allocated)
- kfree(control_type);
+ put_device(&control_type->dev);
return ERR_PTR(result);
}
idr_init(&control_type->idr);
--
2.39.5
next prev parent reply other threads:[~2025-02-11 1:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-11 1:29 [PATCH AUTOSEL 6.13 01/21] nvme-fc: go straight to connecting state when initializing Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 02/21] nvme-fc: do not ignore connectivity loss during connecting Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 03/21] hrtimers: Mark is_migration_base() with __always_inline Sasha Levin
2025-02-11 1:29 ` Sasha Levin [this message]
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 05/21] btrfs: avoid starting new transaction when cleaning qgroup during subvolume drop Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 06/21] futex: Pass in task to futex_queue() Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 07/21] irqchip/riscv: Ensure ordering of memory writes and IPI writes Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 08/21] iscsi_ibft: Fix UBSAN shift-out-of-bounds warning in ibft_attr_show_nic() Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 09/21] sched/debug: Provide slice length for fair tasks Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 10/21] platform/x86/intel: pmc: fix ltr decode in pmc_core_ltr_show() Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 11/21] drm/amd/display: Fix out-of-bound accesses Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 12/21] scsi: core: Use GFP_NOIO to avoid circular locking dependency Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 13/21] scsi: ufs: core: Fix error return with query response Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 14/21] scsi: qla1280: Fix kernel oops when debug level > 2 Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 15/21] Revert "drm/amd/display: Use HW lock mgr for PSR1" Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 16/21] kbuild: keep symbols for symbol_get() even with CONFIG_TRIM_UNUSED_KSYMS Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 17/21] ACPI: resource: IRQ override for Eluktronics MECH-17 Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 18/21] smb: client: fix noisy when tree connecting to DFS interlink targets Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 19/21] alpha/elf: Fix misc/setarch test of util-linux by removing 32bit support Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 20/21] vboxsf: fix building with GCC 15 Sasha Levin
2025-02-11 1:29 ` [PATCH AUTOSEL 6.13 21/21] selftests: always check mask returned by statmount(2) Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250211012954.4096433-4-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=joe@pf.is.s.u-tokyo.ac.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=rafael@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox