[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200623172327.5701-8-kristen@linux.intel.com>
Date: Tue, 23 Jun 2020 10:23:24 -0700
From: Kristen Carlson Accardi <kristen@...ux.intel.com>
To: keescook@...omium.org,
tglx@...utronix.de,
mingo@...hat.com,
bp@...en8.de,
x86@...nel.org,
"H. Peter Anvin" <hpa@...or.com>
Cc: arjan@...ux.intel.com,
linux-kernel@...r.kernel.org,
kernel-hardening@...ts.openwall.com,
rick.p.edgecombe@...el.com,
Kristen Carlson Accardi <kristen@...ux.intel.com>
Subject: [PATCH v3 07/10] x86/boot/compressed: change definition of STATIC
In preparation for changes to the upcoming fgkaslr commit, change misc.c
to not define STATIC as static, but instead set STATIC to "". This allows
memptr to become accessible to multiple files.
Signed-off-by: Kristen Carlson Accardi <kristen@...ux.intel.com>
---
arch/x86/boot/compressed/kaslr.c | 4 ----
arch/x86/boot/compressed/misc.c | 7 ++++---
arch/x86/boot/compressed/misc.h | 6 ++++++
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index d7408af55738..6f596bd5b6e5 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -39,10 +39,6 @@
#include <generated/utsrelease.h>
#include <asm/efi.h>
-/* Macros used by the included decompressor code below. */
-#define STATIC
-#include <linux/decompress/mm.h>
-
#ifdef CONFIG_X86_5LEVEL
unsigned int __pgtable_l5_enabled;
unsigned int pgdir_shift __ro_after_init = 39;
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 9652d5c2afda..a55a4ec48422 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -26,9 +26,6 @@
* it is not safe to place pointers in static structures.
*/
-/* Macros used by the included decompressor code below. */
-#define STATIC static
-
/*
* Use normal definitions of mem*() from string.c. There are already
* included header files which expect a definition of memset() and by
@@ -49,6 +46,10 @@ struct boot_params *boot_params;
memptr free_mem_ptr;
memptr free_mem_end_ptr;
+#ifdef CONFIG_FG_KASLR
+unsigned long malloc_ptr;
+int malloc_count;
+#endif
static char *vidmem;
static int vidport;
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index 726e264410ff..d2ec7c745cfa 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -39,6 +39,12 @@
/* misc.c */
extern memptr free_mem_ptr;
extern memptr free_mem_end_ptr;
+#define STATIC
+#ifdef CONFIG_FG_KASLR
+#define STATIC_RW_DATA extern
+#endif
+#include <linux/decompress/mm.h>
+
extern struct boot_params *boot_params;
void __putstr(const char *s);
void __puthex(unsigned long value);
--
2.20.1
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
