Blame patches.kabi/kABI-powerpc-avoid-including-pgtable.h-in-kup.h.patch
|
Michal Suchanek |
81cd22 |
From 8638527e85592bb3d0cffd0991dcbf0a86fded6a Mon Sep 17 00:00:00 2001
|
|
Michal Suchanek |
81cd22 |
From: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
81cd22 |
Date: Thu, 26 Nov 2020 10:49:46 +0100
|
|
Michal Suchanek |
81cd22 |
Subject: [PATCH] kABI: powerpc: avoid including pgtable.h in kup.h
|
|
Michal Suchanek |
81cd22 |
|
|
Michal Suchanek |
81cd22 |
References: CVE-2020-4788 bsc#1177666
|
|
Michal Suchanek |
81cd22 |
Patch-mainline: never, kABI
|
|
Michal Suchanek |
81cd22 |
|
|
Michal Suchanek |
81cd22 |
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
|
Michal Suchanek |
81cd22 |
---
|
|
Michal Suchanek |
81cd22 |
arch/powerpc/include/asm/kup.h | 2 ++
|
|
Michal Suchanek |
81cd22 |
1 file changed, 2 insertions(+)
|
|
Michal Suchanek |
81cd22 |
|
|
Michal Suchanek |
f7d6c4 |
diff --git a/arch/powerpc/include/asm/kup.h b/arch/powerpc/include/asm/kup.h
|
|
Michal Suchanek |
f7d6c4 |
index f0f8e36ad71f..ee59808661b9 100644
|
|
Michal Suchanek |
81cd22 |
--- a/arch/powerpc/include/asm/kup.h
|
|
Michal Suchanek |
81cd22 |
+++ b/arch/powerpc/include/asm/kup.h
|
|
Michal Suchanek |
81cd22 |
@@ -4,7 +4,9 @@
|
|
Michal Suchanek |
81cd22 |
|
|
Michal Suchanek |
81cd22 |
#ifndef __ASSEMBLY__
|
|
Michal Suchanek |
81cd22 |
|
|
Michal Suchanek |
81cd22 |
+#ifndef __GENKSYMS__
|
|
Michal Suchanek |
81cd22 |
#include <asm/pgtable.h>
|
|
Michal Suchanek |
81cd22 |
+#endif
|
|
Michal Suchanek |
81cd22 |
|
|
Michal Suchanek |
f7d6c4 |
#ifdef CONFIG_PPC_BOOK3S_64
|
|
Michal Suchanek |
f7d6c4 |
#include <asm/book3s/64/kup-radix.h>
|
|
Michal Suchanek |
f7d6c4 |
--
|
|
Michal Suchanek |
f7d6c4 |
2.26.2
|
|
Michal Suchanek |
f7d6c4 |
|