From: "Rui Qi" <qirui.001@bytedance.com>
To: "Yazen Ghannam" <Yazen.Ghannam@amd.com>,
"Borislav Petkov" <bp@alien8.de>,
"Tony Luck" <tony.luck@intel.com>
Cc: "Kees Cook" <kees@kernel.org>,
"Guilherme G . Piccoli" <gpiccoli@igalia.com>,
<muralidhara.mk@amd.com>, <naveenkrishna.chatradhi@amd.com>,
<linux-edac@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Rui Qi" <qirui.001@bytedance.com>
Subject: [PATCH v3] RAS/AMD/FMPM: Fix spurious BUG when ERST record enumeration fails
Date: Fri, 25 Sep 2026 11:09:18 +0800 [thread overview]
Message-ID: <20260925030918.3428029-1-qirui.001@bytedance.com> (raw)
When erst_get_record_id_begin() returns an error, get_saved_records()
jumps to the out_end label and unconditionally calls
erst_get_record_id_end(). But begin() only bumps the
erst_record_id_cache refcount on success, so calling end() after a
failed begin() underflows it.
This is reachable when fmpm is built as a module: if the cache lock
is contended (by pstore, erst-dbg, or apei_read_mce) and a signal
arrives, mutex_lock_interruptible() in begin() returns -EINTR without
incrementing the refcount. end() then takes the lock, decrements the
refcount below zero, and BUG_ON() fires while still holding it. The
loader dies with the mutex held, so every later ERST user blocks
indefinitely.
Built-in fmpm is not affected, since its initcall runs before
userspace and mutex_lock_interruptible() can never see a signal.
Fix it by jumping to the out label on begin() failure, skipping
erst_get_record_id_end(). kfree(old) moves to that shared label so
it still runs on every path.
Fixes: 6f15e617cc99 ("RAS: Introduce a FRU memory poison manager")
Signed-off-by: Rui Qi <qirui.001@bytedance.com>
---
Changes in v3:
- Reword the commit message per review feedback from Yazen Ghannam.
- No code changes.
Patches 1-3 of the series are unchanged and already carry Reviewed-by
on v2; they are not resent.
Link: https://lore.kernel.org/r/20260924161746.GI1080284@yaz-khff2.amd.com
drivers/ras/amd/fmpm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/ras/amd/fmpm.c b/drivers/ras/amd/fmpm.c
index c13db1f743e5..48a437042953 100644
--- a/drivers/ras/amd/fmpm.c
+++ b/drivers/ras/amd/fmpm.c
@@ -673,7 +673,7 @@ static int get_saved_records(void)
ret = erst_get_record_id_begin(&pos);
if (ret < 0)
- goto out_end;
+ goto out;
while (!erst_get_record_id_next(&pos, &record_id)) {
if (record_id == APEI_ERST_INVALID_RECORD_ID)
@@ -714,8 +714,8 @@ static int get_saved_records(void)
out_end:
erst_get_record_id_end();
- kfree(old);
out:
+ kfree(old);
return ret;
}
--
2.20.1
next reply other threads:[~2026-09-25 3:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-25 3:09 Rui Qi [this message]
2026-09-25 14:31 ` Yazen Ghannam
2026-09-28 5:28 ` Borislav Petkov
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=20260925030918.3428029-1-qirui.001@bytedance.com \
--to=qirui.001@bytedance.com \
--cc=Yazen.Ghannam@amd.com \
--cc=bp@alien8.de \
--cc=gpiccoli@igalia.com \
--cc=kees@kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=muralidhara.mk@amd.com \
--cc=naveenkrishna.chatradhi@amd.com \
--cc=tony.luck@intel.com \
/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®