9dd7462461
by cherry-picking the relevant commits from launchpad/lunar [0]. (relevant commits are based on k.o/stable commits for this) minimally tested by booting my (ryzen) machine with this kernel and skimming through dmesg after boot. [0] git://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/lunar Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
83 lines
2.6 KiB
Diff
83 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Wed, 14 Jun 2023 01:39:25 +0200
|
|
Subject: [PATCH] ARM: cpu: Switch to arch_cpu_finalize_init()
|
|
|
|
check_bugs() is about to be phased out. Switch over to the new
|
|
arch_cpu_finalize_init() implementation.
|
|
|
|
No functional change.
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Link: https://lore.kernel.org/r/20230613224545.078124882@linutronix.de
|
|
|
|
(cherry picked from commit ee31bb0524a2e7c99b03f50249a411cc1eaa411f)
|
|
CVE-2022-40982
|
|
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
|
|
Acked-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
|
|
Acked-by: Stefan Bader <stefan.bader@canonical.com>
|
|
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
|
|
(cherry picked from commit 57b198863efe8ec2e2c898f8f3d501734c18afb7)
|
|
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
|
---
|
|
arch/arm/Kconfig | 1 +
|
|
arch/arm/include/asm/bugs.h | 4 ----
|
|
arch/arm/kernel/bugs.c | 3 ++-
|
|
3 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
|
index 1938a2a957bc..eac5314702b0 100644
|
|
--- a/arch/arm/Kconfig
|
|
+++ b/arch/arm/Kconfig
|
|
@@ -5,6 +5,7 @@ config ARM
|
|
select ARCH_32BIT_OFF_T
|
|
select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND
|
|
select ARCH_HAS_BINFMT_FLAT
|
|
+ select ARCH_HAS_CPU_FINALIZE_INIT if MMU
|
|
select ARCH_HAS_CURRENT_STACK_POINTER
|
|
select ARCH_HAS_DEBUG_VIRTUAL if MMU
|
|
select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE
|
|
diff --git a/arch/arm/include/asm/bugs.h b/arch/arm/include/asm/bugs.h
|
|
index 97a312ba0840..fe385551edec 100644
|
|
--- a/arch/arm/include/asm/bugs.h
|
|
+++ b/arch/arm/include/asm/bugs.h
|
|
@@ -1,7 +1,5 @@
|
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
- * arch/arm/include/asm/bugs.h
|
|
- *
|
|
* Copyright (C) 1995-2003 Russell King
|
|
*/
|
|
#ifndef __ASM_BUGS_H
|
|
@@ -10,10 +8,8 @@
|
|
extern void check_writebuffer_bugs(void);
|
|
|
|
#ifdef CONFIG_MMU
|
|
-extern void check_bugs(void);
|
|
extern void check_other_bugs(void);
|
|
#else
|
|
-#define check_bugs() do { } while (0)
|
|
#define check_other_bugs() do { } while (0)
|
|
#endif
|
|
|
|
diff --git a/arch/arm/kernel/bugs.c b/arch/arm/kernel/bugs.c
|
|
index 14c8dbbb7d2d..087bce6ec8e9 100644
|
|
--- a/arch/arm/kernel/bugs.c
|
|
+++ b/arch/arm/kernel/bugs.c
|
|
@@ -1,5 +1,6 @@
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/init.h>
|
|
+#include <linux/cpu.h>
|
|
#include <asm/bugs.h>
|
|
#include <asm/proc-fns.h>
|
|
|
|
@@ -11,7 +12,7 @@ void check_other_bugs(void)
|
|
#endif
|
|
}
|
|
|
|
-void __init check_bugs(void)
|
|
+void __init arch_cpu_finalize_init(void)
|
|
{
|
|
check_writebuffer_bugs();
|
|
check_other_bugs();
|