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=1794064786; b=1a6tWuOa7eORnx5pZk0hZyAczG547oZBGkZPDgtohiMf4Sc3yc+Ru8Qq16SHIvUo/kaW 4G6rojO3/Xw14edleMaH7dYnEL7U2kmWKmTkhPSP60Oekf81XZIUgj9047wdcU5epSK6U uI1h6WGseaaU8viJUuGYpprnWPeJ5p8vuLuBh/JNCl2XSJLxXKncW2XugcdxEqJQZZVa4 k9+UKioWpP/iqr9LSc5nu4f3VhwHzVBpnA+Fh0ZuNewlyP8PcUZw4njtyOX1StU18D7e9 D2VjBCQxzts2cvrIdGEac4Ek3RoJKQjh5uDx45JbgADYhEsiPsiAm5RvOvU2i6GtJ+A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794064786; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=AhRHkMHQ/6gEpPPE2vvkqKKu6WbU4r9GuKwm+UO4JU4=; b=sm1TZMOLdWw76a2LvDcofHQDXvDNFpicesiLs/mhCBNO501riTZsVX28BfxW6D/zfEnW XpDxqzNue7YZogz6qlvtbbQMH39NUncBINOGtJ8wQru5voucMHDKkHGTSefuaIYynlpdE mcHxHgmNkKJ4A5oCS1g22tdG5YRMdbIEQzbolz9PjCDknOm28PKRyIp4wvEG2dqY4WUmJ VkWiKeZegcWfVBjzfm1B9PZkkI2u+WjJg/u+gfhFqPb1IBVYNzGYnoCykGPTn15O7apIe BoC4JOiOgjJN0tbhE18Wk4htx94qB94HpnWO7Pt+GkNyRPPQwCl7T5HSLQRyPr37LjA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=L0qZRg8X; 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 6ED74606A9FB; Sat, 7 Nov 2026 15:19:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=L0qZRg8X Received: by smtp.kernel.org (Postfix) with ESMTPSA id DB6821F008A2; Sat, 7 Nov 2026 15:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794064786; bh=AhRHkMHQ/6gEpPPE2vvkqKKu6WbU4r9GuKwm+UO4JU4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L0qZRg8X7R7o0IJO+J0m9jq7vq/oZVDpesaLTXD6GJ44ruIQ3UuRSRAdV5IH0q05T mfWoKAuR/xqjNr6XzK4gs7/qjNOXYz9hmQS6teYhKfEDVuG72IWyOvszi9uvOFlMxp CuZe1egeJSmp9fIKhsGbpjw9CdlpJExftdDU7jzM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Bradley Morgan , Andrew Morton , Petr Mladek , Guenetr Roeck , Sashiko , Wang Jinchao , Wim Van Sebroeck , Sasha Levin Subject: [PATCH 7.3 0734/1257] panic: restore variable arguments to nmi_panic() Date: Sat, 7 Nov 2026 08:50:30 -0500 Message-ID: <20261107134959.547918921@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134939.434104957@linuxfoundation.org> References: <20261107134939.434104957@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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-Transfer-Encoding: 8bit 7.3-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bradley Morgan [ Upstream commit ed9e4c1ff15d5b935f467811541ca0aa6e49c5d0 ] 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: Signed-off-by: Sasha Levin --- 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 f1dd417e54b29..a9128bf3c168a 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 6b5728c3c9ce2..43ac2b9b5e001 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