From: Ma Ke <make_ruc2021@163.com>
To: Shyam-sundar.S-k@amd.com, hansg@kernel.org,
ilpo.jarvinen@linux.intel.com, mario.limonciello@amd.com
Cc: platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
Ma Ke <make_ruc2021@163.com>,
stable@vger.kernel.org
Subject: [PATCH] platform/x86/amd/pmc: Fix RTC reference leak in amd_pmc_verify_czn_rtc()
Date: Mon, 14 Sep 2026 20:20:01 +0800 [thread overview]
Message-ID: <20260914122002.1701233-1-make_ruc2021@163.com> (raw)
amd_pmc_verify_czn_rtc() opens the RTC with rtc_class_open(), which
takes both a device reference and a module reference on the RTC
driver. rtc_class_close() is the matching release, but it is not
called.
Use a single exit path and close the RTC there, in the same way
ntp.c:sync_hw_clock() does with its out_close: label.
Found by code review.
Fixes: 59348401ebed ("platform/x86: amd-pmc: Add special handling for timer based S0i3 wakeup")
Cc: stable@vger.kernel.org
Signed-off-by: Ma Ke <make_ruc2021@163.com>
---
drivers/platform/x86/amd/pmc/pmc.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/drivers/platform/x86/amd/pmc/pmc.c b/drivers/platform/x86/amd/pmc/pmc.c
index 6792aa2c6187..543bd95e4766 100644
--- a/drivers/platform/x86/amd/pmc/pmc.c
+++ b/drivers/platform/x86/amd/pmc/pmc.c
@@ -671,33 +671,41 @@ static int amd_pmc_verify_czn_rtc(struct amd_pmc_dev *pdev, u32 *arg)
if (rc) {
if (rc == -ENOENT)
dev_dbg(pdev->dev, "no alarm pending\n");
- return rc == -ENOENT ? 0 : rc;
+ rc = rc == -ENOENT ? 0 : rc;
+ goto out_close;
}
if (!alarm.enabled) {
dev_dbg(pdev->dev, "alarm not enabled\n");
- return 0;
+ rc = 0;
+ goto out_close;
}
rc = rtc_read_time(rtc_device, &tm);
if (rc)
- return rc;
+ goto out_close;
then = rtc_tm_to_time64(&alarm.time);
now = rtc_tm_to_time64(&tm);
duration = then-now;
/* in the past */
- if (then < now)
- return 0;
+ if (then < now) {
+ rc = 0;
+ goto out_close;
+ }
/* will be stored in upper 16 bits of s0i3 hint argument,
* so timer wakeup from s0i3 is limited to ~18 hours or less
*/
- if (duration <= 4 || duration > U16_MAX)
- return -EINVAL;
+ if (duration <= 4 || duration > U16_MAX) {
+ rc = -EINVAL;
+ goto out_close;
+ }
*arg |= (duration << 16);
rc = rtc_alarm_irq_enable(rtc_device, 0);
pm_pr_dbg("wakeup timer programmed for %lld seconds\n", duration);
+out_close:
+ rtc_class_close(rtc_device);
return rc;
}
--
2.43.0
next reply other threads:[~2026-09-14 12:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-14 12:20 Ma Ke [this message]
2026-09-14 14:40 ` Mario Limonciello
2026-09-15 10:25 ` Ilpo Järvinen
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=20260914122002.1701233-1-make_ruc2021@163.com \
--to=make_ruc2021@163.com \
--cc=Shyam-sundar.S-k@amd.com \
--cc=akpm@linux-foundation.org \
--cc=hansg@kernel.org \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mario.limonciello@amd.com \
--cc=platform-driver-x86@vger.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
all inboxes | Powered by JetHome®