From: Bradley Morgan <brads@mainlining.org>
To: akpm@linux-foundation.org
Cc: blum@kernel.org, tglx@linutronix.de, dianders@chromium.org,
linux-kernel@vger.kernel.org, brads@mainlining.org
Subject: [PATCH] watchdog/perf: reject empty config before the raw event parse
Date: Fri, 2 Oct 2026 17:50:00 +0000 [thread overview]
Message-ID: <20261002175000.1-brads@mainlining.org> (raw)
Date: Fri, 2 Oct 2026 17:39:13 +0000
Subject: [PATCH] watchdog/perf: reject empty config before the raw event parse
Commit 6164be01f179 ("watchdog/perf: optimize bytes copied and remove
manual NUL-termination") replaced strscpy(buf, str, sizeof(buf)) plus a
manual buf[len] = 0 with strscpy(buf, str, len). strscpy() writes
nothing at all when the count is zero, so on a comma directly after
the "r" prefix, nmi_watchdog=r,1 for example, len is 0, buf stays
uninitialized, and kstrtoull() parses whatever stack garbage is there.
The old code was safe here by accident, strscpy() filled the whole
buffer before buf[len] = 0 overwrote the comma position, so a zero
length just produced an empty string and a clean parse failure.
Treat an empty config the same as an overlong one and return early.
Fixes: 6164be01f179 ("watchdog/perf: optimize bytes copied and remove manual NUL-termination")
Signed-off-by: Bradley Morgan <brads@mainlining.org>
---
kernel/watchdog_perf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/watchdog_perf.c b/kernel/watchdog_perf.c
index cf05775a96d3..cca0485ba28c 100644
--- a/kernel/watchdog_perf.c
+++ b/kernel/watchdog_perf.c
@@ -301,7 +301,7 @@ void __init hardlockup_config_perf_event(const char *str)
} else {
unsigned int len = comma - str;
- if (len > sizeof(buf))
+ if (!len || len > sizeof(buf))
return;
strscpy(buf, str, len);
--
2.53.0
next reply other threads:[~2026-10-02 17:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-02 17:50 Bradley Morgan [this message]
2026-10-02 22:12 ` Doug Anderson
2026-10-02 22:17 ` Bradley Morgan
2026-10-02 22:19 ` Doug Anderson
2026-10-03 0:08 ` [PATCH v2] watchdog/perf: fix off by one in the raw event config copy Bradley Morgan
2026-10-03 0:30 ` Doug Anderson
2026-10-03 10:28 ` Bradley Morgan
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=20261002175000.1-brads@mainlining.org \
--to=brads@mainlining.org \
--cc=akpm@linux-foundation.org \
--cc=blum@kernel.org \
--cc=dianders@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/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®