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 C8D291DE8AB; Wed, 19 Mar 2025 14:39:42 +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=1742395182; cv=none; b=cSBXBxm1LQlYTzLfoa2O8peTX80d/L/xF6yoPb5mCiKIY3QzgGnGhcZ+EM+Bv52bU/I8X7Xvqj399Et4Zgdnnb1FFyp+mG3Ahu/CJlDZ8qRQdq9EBhkcp2L66MjRt/4CCByZQcn0fTNgTcJw6qsE+leXmwsX1jrjawjqZ4dDYeU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742395182; c=relaxed/simple; bh=y2874EppX31QrvfZERnxmRGhX9VcH3JJ4Nh7eXBYi38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qMmqnXVNTQIa7m2162iInlrKqLLNvz3mLPQZueuuVN5U2Bm6yhsAj7h3cGySa4zkG4hU+kmciGR3Ovd/g8v7mhSzNhUIAVxSdc1D7zk6PLEkXsx9A1jwLtPF995hqeprKY3cDGtS5tOKM3vpeFWWGzCCKcGmDCBkUtE8z5AqUSc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UXcYQhmB; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UXcYQhmB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94FF4C4CEE4; Wed, 19 Mar 2025 14:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1742395182; bh=y2874EppX31QrvfZERnxmRGhX9VcH3JJ4Nh7eXBYi38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UXcYQhmB1AfXldEH0rUpVytDKpOIIzFmpeUeftncN9G5oueZBxtJpDrgziWkqPlyz f0R/1jlVWbUfQjgMvLSSq5MKejly65upzTb5PcbkO5Ak8nz6HIzUOoNoUHWBOXgNSR OLk5dm23svHtIQLZAfx7UkgvMIDgtaCL/J18ik8o= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Joe Hattori , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.6 039/166] powercap: call put_device() on an error path in powercap_register_control_type() Date: Wed, 19 Mar 2025 07:30:10 -0700 Message-ID: <20250319143021.048939461@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250319143019.983527953@linuxfoundation.org> References: <20250319143019.983527953@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Joe Hattori [ 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 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 Signed-off-by: Sasha Levin --- 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