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 v3] watchdog/perf: one digit too short in the raw event config copy
Date: Sat, 3 Oct 2026 11:02:00 +0000 [thread overview]
Message-ID: <20261003110200.3-brads@mainlining.org> (raw)
Commit 6164be01f179 ("watchdog/perf: optimize bytes copied and remove
manual NUL-termination") swapped strscpy(buf, str, sizeof(buf)) plus a
manual buf[len] = 0 for strscpy(buf, str, len), and that count is one
short. strscpy() keeps the last byte of the destination for the NUL,
so the config loses its final digit, nmi_watchdog=r300,panic for
example ends up with buf = "30" and arms the raw event with the wrong
config.
The empty case falls over too, strscpy() with a zero count writes
nothing at all, so nmi_watchdog=r,1 leaves buf uninitialized and
kstrtoull() reads whatever stack garbage is sitting there.
The old code was safe on both by accident, it filled the whole buffer
first and buf[len] = 0 then stomped the comma position, so the worst
you got was a truncated parse failure.
Pass len + 1 so the copy includes the character the NUL replaces, and
reject len >= sizeof(buf) like it was before the optimization, which
also turns an empty config back into a clean parse failure.
Fixes: 6164be01f179 ("watchdog/perf: optimize bytes copied and remove manual NUL-termination")
Signed-off-by: Bradley Morgan <brads@mainlining.org>
Changes since v2:
- rebased on pristine mainline, v2 was cut on top of v1 so the diff
carried v1's hunks
- the intro note moved below the cut, it ended up in the commit
message in v2
- dropped the Suggested-by, review feedback doesn't warrant one
---
kernel/watchdog_perf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/watchdog_perf.c b/kernel/watchdog_perf.c
index cf05775a96d3..a4f677c16b20 100644
--- a/kernel/watchdog_perf.c
+++ b/kernel/watchdog_perf.c
@@ -301,10 +301,10 @@ void __init hardlockup_config_perf_event(const char *str)
} else {
unsigned int len = comma - str;
- if (len > sizeof(buf))
+ if (len >= sizeof(buf))
return;
- strscpy(buf, str, len);
+ strscpy(buf, str, len + 1);
if (kstrtoull(buf, 16, &config))
return;
}
--
2.53.0
next reply other threads:[~2026-10-03 10:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-03 11:02 Bradley Morgan [this message]
2026-10-03 10:41 ` 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=20261003110200.3-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®