Skip to contentSkip to conversation

x86 fixes for v3.14-rc5

GIT PULL H. Peter Anvin 1 participant 1 message Mar 2, 2014 x86

lore
Share & tools
lore
#0 lore raw

Hi Linus,

The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691:

Linux 3.14-rc4 (2014-02-23 17:40:03 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus

for you to fetch changes up to e290e8c59dbc2a15088d868170d799f763202fef:

x86, kaslr: add missed "static" declarations (2014-02-25 16:59:29 -0800)

The VMCOREINFO patch I'll pushing for this release to avoid having a release with kASLR and but without that information.

I was hoping to include the FPU patches from Suresh, but ran into a problem (see other thread); will try to make them happen next week.

-hpa

----------------------------------------------------------------
Eugene Surovegin (1):
x86, kaslr: export offset in VMCOREINFO ELF notes

Kees Cook (1):
x86, kaslr: add missed "static" declarations

 arch/x86/boot/compressed/aslr.c    | 9 +++++----
 arch/x86/kernel/machine_kexec_64.c | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)
arch/x86/boot/compressed/aslr.c +5 -4
index 90a21f430117..4dbf967da50d 100644
@@ -111,7 +111,7 @@ struct mem_vector {
 };
 
 #define MEM_AVOID_MAX 5
-struct mem_vector mem_avoid[MEM_AVOID_MAX];
+static struct mem_vector mem_avoid[MEM_AVOID_MAX];
 
 static bool mem_contains(struct mem_vector *region, struct mem_vector *item)
 {
@@ -180,7 +180,7 @@ static void mem_avoid_init(unsigned long input, unsigned long input_size,
 }
 
 /* Does this memory vector overlap a known avoided area? */
-bool mem_avoid_overlap(struct mem_vector *img)
+static bool mem_avoid_overlap(struct mem_vector *img)
 {
 	int i;
 
@@ -192,8 +192,9 @@ bool mem_avoid_overlap(struct mem_vector *img)
 	return false;
 }
 
-unsigned long slots[CONFIG_RANDOMIZE_BASE_MAX_OFFSET / CONFIG_PHYSICAL_ALIGN];
-unsigned long slot_max = 0;
+static unsigned long slots[CONFIG_RANDOMIZE_BASE_MAX_OFFSET /
+			   CONFIG_PHYSICAL_ALIGN];
+static unsigned long slot_max;
 
 static void slots_append(unsigned long addr)
 {
arch/x86/kernel/machine_kexec_64.c +2 -0
index 4eabc160696f..679cef0791cd 100644
@@ -279,5 +279,7 @@ void arch_crash_save_vmcoreinfo(void)
 	VMCOREINFO_SYMBOL(node_data);
 	VMCOREINFO_LENGTH(node_data, MAX_NUMNODES);
 #endif
+	vmcoreinfo_append_str("KERNELOFFSET=%lx\n",
+			      (unsigned long)&_text - __START_KERNEL);
 }