linux-kernel - [PATCH] alpha: Fix build around srm_sysrq_reboot

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20200611091139.8525-1-joro@8bytes.org>
Date:   Thu, 11 Jun 2020 11:11:39 +0200
From:   Joerg Roedel <joro@...tes.org>
To:     Richard Henderson <rth@...ddle.net>
Cc:     Ivan Kokshaysky <ink@...assic.park.msu.ru>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        linux-alpha@...r.kernel.org, linux-kernel@...r.kernel.org,
        Joerg Roedel <jroedel@...e.de>,
        Emil Velikov <emil.l.velikov@...il.com>,
        Guenter Roeck <linux@...ck-us.net>
Subject: [PATCH] alpha: Fix build around srm_sysrq_reboot_op

From: Joerg Roedel <jroedel@...e.de>

The patch introducing the struct was probably never compile tested,
because it sets a handler with a wrong function signature. Wrap the
handler into a functions with the correct signature to fix the build.

Fixes: 0f1c9688a194 ("tty/sysrq: alpha: export and use __sysrq_get_key_op()")
Cc: Emil Velikov <emil.l.velikov@...il.com>
Cc: Guenter Roeck <linux@...ck-us.net>
Signed-off-by: Joerg Roedel <jroedel@...e.de>
---
 arch/alpha/kernel/setup.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index f5c42a8fcf9c..53520f8cb904 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -430,8 +430,13 @@ register_cpus(void)
 arch_initcall(register_cpus);
 
 #ifdef CONFIG_MAGIC_SYSRQ
+static void sysrq_reboot_handler(int unused)
+{
+	machine_halt();
+}
+
 static const struct sysrq_key_op srm_sysrq_reboot_op = {
-	.handler	= machine_halt,
+	.handler	= sysrq_reboot_handler,
 	.help_msg       = "reboot(b)",
 	.action_msg     = "Resetting",
 	.enable_mask    = SYSRQ_ENABLE_BOOT,
-- 
2.26.2