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>
76 lines
2.3 KiB
Diff
76 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Wed, 14 Jun 2023 01:39:36 +0200
|
|
Subject: [PATCH] um/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>
|
|
Acked-by: Richard Weinberger <richard@nod.at>
|
|
Link: https://lore.kernel.org/r/20230613224545.493148694@linutronix.de
|
|
|
|
(cherry picked from commit 9349b5cd0908f8afe95529fc7a8cbb1417df9b0c)
|
|
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 37d44a1fca2e73fabeaf042a5bcdff3bd8e03224)
|
|
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
|
---
|
|
arch/um/Kconfig | 1 +
|
|
arch/um/include/asm/bugs.h | 7 -------
|
|
arch/um/kernel/um_arch.c | 3 ++-
|
|
3 files changed, 3 insertions(+), 8 deletions(-)
|
|
delete mode 100644 arch/um/include/asm/bugs.h
|
|
|
|
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
|
|
index ad4ff3b0e91e..82709bc36df7 100644
|
|
--- a/arch/um/Kconfig
|
|
+++ b/arch/um/Kconfig
|
|
@@ -6,6 +6,7 @@ config UML
|
|
bool
|
|
default y
|
|
select ARCH_EPHEMERAL_INODES
|
|
+ select ARCH_HAS_CPU_FINALIZE_INIT
|
|
select ARCH_HAS_FORTIFY_SOURCE
|
|
select ARCH_HAS_GCOV_PROFILE_ALL
|
|
select ARCH_HAS_KCOV
|
|
diff --git a/arch/um/include/asm/bugs.h b/arch/um/include/asm/bugs.h
|
|
deleted file mode 100644
|
|
index 4473942a0839..000000000000
|
|
--- a/arch/um/include/asm/bugs.h
|
|
+++ /dev/null
|
|
@@ -1,7 +0,0 @@
|
|
-/* SPDX-License-Identifier: GPL-2.0 */
|
|
-#ifndef __UM_BUGS_H
|
|
-#define __UM_BUGS_H
|
|
-
|
|
-void check_bugs(void);
|
|
-
|
|
-#endif
|
|
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
|
|
index 786b44dc20c9..664f477fe084 100644
|
|
--- a/arch/um/kernel/um_arch.c
|
|
+++ b/arch/um/kernel/um_arch.c
|
|
@@ -3,6 +3,7 @@
|
|
* Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
*/
|
|
|
|
+#include <linux/cpu.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
@@ -426,7 +427,7 @@ void __init setup_arch(char **cmdline_p)
|
|
}
|
|
}
|
|
|
|
-void __init check_bugs(void)
|
|
+void __init arch_cpu_finalize_init(void)
|
|
{
|
|
arch_check_bugs();
|
|
os_check_bugs();
|