From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,tglx@kernel.org,dianders@chromium.org,blum@kernel.org,brads@mainlining.org,akpm@linux-foundation.org
Subject: [to-be-updated] watchdog-perf-reject-empty-config-before-the-raw-event-parse.patch removed from -mm tree
Date: Fri, 02 Oct 2026 15:55:30 -0700 [thread overview]
Message-ID: <20261002225531.098A21F000FF@smtp.kernel.org> (raw)
The quilt patch titled
Subject: watchdog/perf: reject empty config before the raw event parse
has been removed from the -mm tree. Its filename was
watchdog-perf-reject-empty-config-before-the-raw-event-parse.patch
This patch was dropped because an updated version will be issued
------------------------------------------------------
From: Bradley Morgan <brads@mainlining.org>
Subject: watchdog/perf: reject empty config before the raw event parse
Date: Fri, 2 Oct 2026 17:39:13 +0000
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.
Link: https://lore.kernel.org/20261002175000.1-brads@mainlining.org
Fixes: 6164be01f179 ("watchdog/perf: optimize bytes copied and remove manual NUL-termination")
Signed-off-by: Bradley Morgan <brads@mainlining.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Thorsten Blum <blum@kernel.org>
Cc: Thomas Gleixner <tglx@kernel.org>
Cc: Douglas Anderson <dianders@chromium.org>
---
kernel/watchdog_perf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/kernel/watchdog_perf.c~watchdog-perf-reject-empty-config-before-the-raw-event-parse
+++ a/kernel/watchdog_perf.c
@@ -301,7 +301,7 @@ void __init hardlockup_config_perf_event
} else {
unsigned int len = comma - str;
- if (len > sizeof(buf))
+ if (!len || len > sizeof(buf))
return;
strscpy(buf, str, len);
_
Patches currently in -mm which might be from brads@mainlining.org are
taskstats-copy-signal-stats-under-siglock-in-taskstats_exit.patch
mailmap-update-email-address-for-bradley-morgan.patch
taskstats-drop-the-unused-cpu_dont_care-enum-member.patch
panic-fix-redirect-cpu-race-in-panic_try_force_cpu.patch
panic-flatten-nmi_panic-control-flow.patch
panic-fix-va_list-reuse-in-panic_try_force_cpu.patch
panic-restore-variable-arguments-to-nmi_panic.patch
panic-allow-force_cpu-redirect-from-an-nmi.patch
panic-kill-the-buffer-unavailable-redirect-fallback.patch
reply other threads:[~2026-10-02 22:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261002225531.098A21F000FF@smtp.kernel.org \
--to=akpm@linux-foundation.org \
--cc=blum@kernel.org \
--cc=brads@mainlining.org \
--cc=dianders@chromium.org \
--cc=mm-commits@vger.kernel.org \
--cc=tglx@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.