From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048514; b=B0Aa2NRsBx3JuUJM6gPaZXmK73uE/RuYrAv5EqwsXaFa2BFZqIZ99shMkYv1ou8hat1b HBGb2bqAwsygzQ4ST0cZ+Rb9owvV6tY/k7EIC04/o1odEwCurz2Jzm4gSIZzmzPxOeE+a JRgwJ/Zd9v8Kzpn86kN5AUGOrKI9QiA4mQGG07OAyw0VcMkbVqs1L8ngb4/xLt+onRSGU LfHClVZRXClHBFdw1HYYTK8V2QUhUrol0babCb7PazZ+Qrier6pcORA213OlFvmZAJ7wh 4+rmkw2UiEi2A5zrwmVcDgGWqxdpdOWvtDFhOoyk5b50spch5XCJvRN9HGG3K9dWQhg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048514; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=gR2RK6sZRb06u4Ivk5Eu/eKdQeIlR6M4EdPfnsANwSs=; b=wFa8eqeuP2GtbWoLQSJy98lvccwQxzAywCXjqdaQsy/MKAnuxoCfrW9dtFGFKoHMfVgk YPkn4/mb/cvj6zrRmx6bTg7SUi13lzAGmiEbV8i+OgDkV+vjSjf6HWSkTl80OAZqZkZKL yDhcrZ+hqzlMMRB9Oa0MEqtyewQ0KmPyjRvVD1wciVKuPyAo/SypB8ORUXkzguG5BJz+E OodcZz9k6KmCS2D/XzY7u09CcwYAht1YoZA026ZbAxnd/sno7hANyZkEz1MVtP0S5k9a4 KqMFhfdS3dkHpOViDbJov9LRONsNHOYkHwmnL72+0zu3mOEpLMpwpJopv/4F+0G1o7Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=fACmxw0d; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC3FE606A32E for ; Sat, 7 Nov 2026 10:48:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=fACmxw0d Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0C7E1F0089F; Sat, 7 Nov 2026 10:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048513; bh=gR2RK6sZRb06u4Ivk5Eu/eKdQeIlR6M4EdPfnsANwSs=; h=From:To:Cc:Subject:Date; b=fACmxw0d7hs0scaEaGyoNrx7QsvHsS4+prQ+pxTEOhiujmf1K170WyYo0Mt9rsgFd 3ib70S6JfzmOy2IOvX3QyrjbD5ZWA0INYTZiEjQTZuVoqugvae5sNFii9EZiqlqV8w rXUa1X8QAtjcpvzoCJiY6MpCrGOGtfGNmGEPBodGU5/ISKQ3zaU0jFMJhl+ddECUxc A/bf8Kh1Bisx4XsKdPrBMfYVPHr+L+7NVhEEfSvmYyBkrjElZLz2+U66KdsEzc2DmH xY9+cb0f2XtiUGYqZQdpOgoqXtiCMFCmiaWW0G1RDlAQWJB1hcew5So8OC1RWJdi7P IaF6nAu3fxZHQ== From: Sasha Levin To: brads@mainlining.org, akpm@linux-foundation.org, pmladek@suse.com, linux@roeck-us.net, sashiko-bot@kernel.org, wangjinchao600@gmail.com, wim@linux-watchdog.org Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] panic: restore variable arguments to nmi_panic()" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:48:31 -0500 Message-ID: <20261107054831-failed-6.1-ed9e4c1ff15d@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x ed9e4c1ff15d5b935f467811541ca0aa6e49c5d0 # git commit -s git send-email --to '' --in-reply-to '20261107054831-failed-6.1-ed9e4c1ff15d@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From ed9e4c1ff15d5b935f467811541ca0aa6e49c5d0 Mon Sep 17 00:00:00 2001 From: Bradley Morgan Date: Wed, 16 Sep 2026 18:29:55 +0000 Subject: [PATCH] panic: restore variable arguments to nmi_panic() nmi_panic() used to accept variable arguments until commit ebc41f20d77f ("panic: change nmi_panic from macro to function") flattened it to a final message string. vpanic() did not exist back then, so the function had to format through panic("%s", msg). Bring the variable arguments back and format with vpanic() directly. The next patch makes nmi_panic() try the panic_force_cpu= redirect before claiming panic_cpu. panic_try_force_cpu() needs to print the message but it is used also by panic() which accepts variable argument list. The string could be formatted only when a CPU gets assigned to process the redirection. Otherwise, there might be a race when writing to the `panic_force_buf`. No current caller passes a string with format specifiers. The closest one is hpwdt_pretimeout(), which builds panic_msg with hex_byte_pack() and has only two variants, both plain strings. But the new __printf() annotation on nmi_panic() would warn with -Wformat-security there because the buffer is passed directly as the format argument, so switch it to nmi_panic(regs, "%s", panic_msg). [pmladek@suse.com: changelog fix] Link: https://lore.kernel.org/arJxFybmtD7OBIcL@pathway.suse.cz Link: https://lore.kernel.org/20260916182957.7788-5-brads@mainlining.org Signed-off-by: Bradley Morgan Signed-off-by: Andrew Morton Suggested-by: Petr Mladek Reviewed-by: Petr Mladek Cc: Guenetr Roeck Cc: Sashiko Cc: Wang Jinchao Cc: Wim Van Sebroeck Cc: --- drivers/watchdog/hpwdt.c | 2 +- include/linux/panic.h | 3 ++- kernel/panic.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 8af1fad2de0bd..78227d200afe4 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -199,7 +199,7 @@ static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs) } hex_byte_pack(panic_msg, nmistat); - nmi_panic(regs, panic_msg); + nmi_panic(regs, "%s", panic_msg); return NMI_HANDLED; } diff --git a/include/linux/panic.h b/include/linux/panic.h index 98dd7dfd27de7..17e61b61c45f8 100644 --- a/include/linux/panic.h +++ b/include/linux/panic.h @@ -13,7 +13,8 @@ __printf(1, 2) void panic(const char *fmt, ...) __noreturn __cold; __printf(1, 0) void vpanic(const char *fmt, va_list args) __noreturn __cold; -void nmi_panic(struct pt_regs *regs, const char *msg); +__printf(2, 3) +void nmi_panic(struct pt_regs *regs, const char *fmt, ...); void check_panic_on_warn(const char *origin); extern void oops_enter(void); extern void oops_exit(void); diff --git a/kernel/panic.c b/kernel/panic.c index 7388eb81a1c47..e240ca06faab2 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -518,13 +518,19 @@ EXPORT_SYMBOL(panic_on_other_cpu); * nmi_panic_self_stop() which can provide architecture dependent code such * as saving register state for crash dump. */ -void nmi_panic(struct pt_regs *regs, const char *msg) +void nmi_panic(struct pt_regs *regs, const char *fmt, ...) { + va_list args; + + va_start(args, fmt); + if (panic_try_start()) - panic("%s", msg); + vpanic(fmt, args); if (panic_on_other_cpu()) nmi_panic_self_stop(regs); + + va_end(args); } EXPORT_SYMBOL(nmi_panic); -- 2.53.0