Skip to contentSkip to conversation

kexec/arch/i386: Add support for KASLR memory randomization

PATCH In review Thomas Garnier 3 participants 7 messages Aug 17, 2016 – Sep 26, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kexec/arch/i386: Add support for KASLR memory randomization

Multiple changes were made on KASLR (right now in linux-next). One of them is randomizing the virtual address of the physical mapping, vmalloc and vmemmap memory sections. It breaks kdump ability to read physical memory.

This change identifies if KASLR memories randomization is used by checking if the page_offset_base variable exists. It search for the correct PAGE_OFFSET value by looking at the loaded memory section and find the lowest aligned on PUD (the randomization level).

Related commits on linux-next:
- 0483e1fa6e09d4948272680f691dccb1edb9677f: Base for randomization
- 021182e52fe01c1f7b126f97fd6ba048dc4234fd: Enable for PAGE_OFFSET

---
 kexec/arch/i386/crashdump-x86.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
kexec/arch/i386/crashdump-x86.c +22 -7
index bbc0f35..ab833d4 100644
@@ -102,11 +102,10 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),
 	return -1;
 }
 
-/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */
-static unsigned long long get_kernel_stext_sym(void)
+/* Retrieve kernel symbol virtual address from /proc/kallsyms */
+static unsigned long long get_kernel_sym(const char *symbol)
 {
 	const char *kallsyms = "/proc/kallsyms";
-	const char *stext = "_stext";
 	char sym[128];
 	char line[128];
 	FILE *fp;
@@ -122,13 +121,13 @@ static unsigned long long get_kernel_stext_sym(void)
 	while(fgets(line, sizeof(line), fp) != NULL) {
 		if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)
 			continue;
-		if (strcmp(sym, stext) == 0) {
-			dbgprintf("kernel symbol %s vaddr = %16llx\n", stext, vaddr);
+		if (strcmp(sym, symbol) == 0) {
+			dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);
 			return vaddr;
 		}
 	}
 
-	fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);
+	fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);
 	return 0;
 }
 
@@ -151,6 +150,8 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 	off_t size;
 	uint32_t elf_flags = 0;
 	uint64_t stext_sym;
+	const unsigned long long pud_mask = ~((1 << 30) - 1);
+	unsigned long long vaddr, lowest_vaddr = 0;
 
 	if (elf_info->machine != EM_X86_64)
 		return 0;
@@ -180,9 +181,23 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 
 	end_phdr = &ehdr.e_phdr[ehdr.e_phnum];
 
+	/* Search for the real PAGE_OFFSET when KASLR memory randomization
+	 * is enabled */
+	if (get_kernel_sym("page_offset_base") != 0) {
+		for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) {
+			if (phdr->p_type == PT_LOAD) {
+				vaddr = phdr->p_vaddr & pud_mask;
+				if (lowest_vaddr == 0 || lowest_vaddr > vaddr)
+					lowest_vaddr = vaddr;
+			}
+		}
+		if (lowest_vaddr != 0)
+			elf_info->page_offset = lowest_vaddr;
+	}
+
 	/* Traverse through the Elf headers and find the region where
 	 * _stext symbol is located in. That's where kernel is mapped */
-	stext_sym = get_kernel_stext_sym();
+	stext_sym = get_kernel_sym("_stext");
 	for(phdr = ehdr.e_phdr; stext_sym && phdr != end_phdr; phdr++) {
 		if (phdr->p_type == PT_LOAD) {
 			unsigned long long saddr = phdr->p_vaddr;
Signature · 1 line
2.8.0.rc3.226.g39d4020
#1 lore raw
Quoted 5 lines · Thomas Garnier

Multiple changes were made on KASLR (right now in linux-next). One of them is randomizing the virtual address of the physical mapping, vmalloc and vmemmap memory sections. It breaks kdump ability to read physical memory.

Quoted 8 lines

This change identifies if KASLR memories randomization is used by checking if the page_offset_base variable exists. It search for the correct PAGE_OFFSET value by looking at the loaded memory section and find the lowest aligned on PUD (the randomization level).

Related commits on linux-next:
- 0483e1fa6e09d4948272680f691dccb1edb9677f: Base for randomization
- 021182e52fe01c1f7b126f97fd6ba048dc4234fd: Enable for PAGE_OFFSET

Seems above two commits have been inside Linus's tree, while vmemmap not yet.

Quoted 51 lines
---
 kexec/arch/i386/crashdump-x86.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
kexec/arch/i386/crashdump-x86.c +7 -6
index bbc0f35..ab833d4 100644
@@ -102,11 +102,10 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),
 	return -1;
 }
 
-/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */
-static unsigned long long get_kernel_stext_sym(void)
+/* Retrieve kernel symbol virtual address from /proc/kallsyms */
+static unsigned long long get_kernel_sym(const char *symbol)
 {
 	const char *kallsyms = "/proc/kallsyms";
-	const char *stext = "_stext";
 	char sym[128];
 	char line[128];
 	FILE *fp;
@@ -122,13 +121,13 @@ static unsigned long long get_kernel_stext_sym(void)
 	while(fgets(line, sizeof(line), fp) != NULL) {
 		if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)
 			continue;
-		if (strcmp(sym, stext) == 0) {
-			dbgprintf("kernel symbol %s vaddr = %16llx\n", stext, vaddr);
+		if (strcmp(sym, symbol) == 0) {
+			dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);
 			return vaddr;
 		}
 	}
 
-	fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);
+	fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);
 	return 0;
 }
 
@@ -151,6 +150,8 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 	off_t size;
 	uint32_t elf_flags = 0;
 	uint64_t stext_sym;
+	const unsigned long long pud_mask = ~((1 << 30) - 1);
+	unsigned long long vaddr, lowest_vaddr = 0;
 
 	if (elf_info->machine != EM_X86_64)
 		return 0;

kexec/arch/i386/crashdump-x86.c static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info), · line 185

Quoted 5 lines
kexec/arch/i386/crashdump-x86.c +2 -0
@@ -180,9 +181,23 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 
 	end_phdr = &ehdr.e_phdr[ehdr.e_phnum];
 
+	/* Search for the real PAGE_OFFSET when KASLR memory randomization
+	 * is enabled */

Yeah, this is necessary. That would be great if it can be put into get_kernel_page_offset. But then it need parse kcore elf file again, seems no better way.

Quoted 27 lines
kexec/arch/i386/crashdump-x86.c +13 -1
+	if (get_kernel_sym("page_offset_base") != 0) {
+		for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) {
+			if (phdr->p_type == PT_LOAD) {
+				vaddr = phdr->p_vaddr & pud_mask;
+				if (lowest_vaddr == 0 || lowest_vaddr > vaddr)
+					lowest_vaddr = vaddr;
+			}
+		}
+		if (lowest_vaddr != 0)
+			elf_info->page_offset = lowest_vaddr;
+	}
+
 	/* Traverse through the Elf headers and find the region where
 	 * _stext symbol is located in. That's where kernel is mapped */
-	stext_sym = get_kernel_stext_sym();
+	stext_sym = get_kernel_sym("_stext");
 	for(phdr = ehdr.e_phdr; stext_sym && phdr != end_phdr; phdr++) {
 		if (phdr->p_type == PT_LOAD) {
 			unsigned long long saddr = phdr->p_vaddr;
Signature · 7 lines
2.8.0.rc3.226.g39d4020


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#2 lore raw
Quoted 70 lines · Baoquan He
Quoted 5 lines · Thomas Garnier

Multiple changes were made on KASLR (right now in linux-next). One of them is randomizing the virtual address of the physical mapping, vmalloc and vmemmap memory sections. It breaks kdump ability to read physical memory.

Quoted 8 lines

This change identifies if KASLR memories randomization is used by checking if the page_offset_base variable exists. It search for the correct PAGE_OFFSET value by looking at the loaded memory section and find the lowest aligned on PUD (the randomization level).

Related commits on linux-next:
- 0483e1fa6e09d4948272680f691dccb1edb9677f: Base for randomization
- 021182e52fe01c1f7b126f97fd6ba048dc4234fd: Enable for PAGE_OFFSET

Seems above two commits have been inside Linus's tree, while vmemmap not yet.

Quoted 52 lines
---
 kexec/arch/i386/crashdump-x86.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
kexec/arch/i386/crashdump-x86.c +7 -6
index bbc0f35..ab833d4 100644
@@ -102,11 +102,10 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),
      return -1;
 }
 
-/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */
-static unsigned long long get_kernel_stext_sym(void)
+/* Retrieve kernel symbol virtual address from /proc/kallsyms */
+static unsigned long long get_kernel_sym(const char *symbol)
 {
      const char *kallsyms = "/proc/kallsyms";
-     const char *stext = "_stext";
      char sym[128];
      char line[128];
      FILE *fp;
@@ -122,13 +121,13 @@ static unsigned long long get_kernel_stext_sym(void)
      while(fgets(line, sizeof(line), fp) != NULL) {
              if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)
                      continue;
-             if (strcmp(sym, stext) == 0) {
-                     dbgprintf("kernel symbol %s vaddr = %16llx\n", stext, vaddr);
+             if (strcmp(sym, symbol) == 0) {
+                     dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);
                      return vaddr;
              }
      }
 
-     fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);
+     fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);
      return 0;
 }
 
@@ -151,6 +150,8 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
      off_t size;
      uint32_t elf_flags = 0;
      uint64_t stext_sym;
+     const unsigned long long pud_mask = ~((1 << 30) - 1);
+     unsigned long long vaddr, lowest_vaddr = 0;
 
      if (elf_info->machine != EM_X86_64)
              return 0;
@@ -180,9 +181,23 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 
Quoted 9 lines

kexec/arch/i386/crashdump-x86.c static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info), · line 185

Quoted 4 lines
kexec/arch/i386/crashdump-x86.c +2 -0
      end_phdr = &ehdr.e_phdr[ehdr.e_phnum];
 
+     /* Search for the real PAGE_OFFSET when KASLR memory randomization
+      * is enabled */

Yeah, this is necessary. That would be great if it can be put into get_kernel_page_offset. But then it need parse kcore elf file again, seems no better way.

I agree.

Simon: Do you have any comments?

Quoted 27 lines
Quoted 27 lines
kexec/arch/i386/crashdump-x86.c +13 -2
+     if (get_kernel_sym("page_offset_base") != 0) {
+             for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) {
+                     if (phdr->p_type == PT_LOAD) {
+                             vaddr = phdr->p_vaddr & pud_mask;
+                             if (lowest_vaddr == 0 || lowest_vaddr > vaddr)
+                                     lowest_vaddr = vaddr;
+                     }
+             }
+             if (lowest_vaddr != 0)
+                     elf_info->page_offset = lowest_vaddr;
+     }
+
      /* Traverse through the Elf headers and find the region where
       * _stext symbol is located in. That's where kernel is mapped */
-     stext_sym = get_kernel_stext_sym();
+     stext_sym = get_kernel_sym("_stext");
      for(phdr = ehdr.e_phdr; stext_sym && phdr != end_phdr; phdr++) {
              if (phdr->p_type == PT_LOAD) {
                      unsigned long long saddr = phdr->p_vaddr;
--

2.8.0.rc3.226.g39d4020

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#3 lore raw
In reply to Thomas Garnier

Hi, Thomas

Quoted 4 lines · Thomas Garnier

Multiple changes were made on KASLR (right now in linux-next). One of them is randomizing the virtual address of the physical mapping, vmalloc and vmemmap memory sections. It breaks kdump ability to read physical memory.

What is the user visible behavior without this patch? Could you add more in the patch log?

During my testing seems with or without this patch kdump kernel boot both fine.

My kernel config options is like below, is it enough to test this patch? CONFIG_RANDOMIZE_BASE=y
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0

Quoted 20 lines

This change identifies if KASLR memories randomization is used by checking if the page_offset_base variable exists. It search for the correct PAGE_OFFSET value by looking at the loaded memory section and find the lowest aligned on PUD (the randomization level).

Related commits on linux-next:
- 0483e1fa6e09d4948272680f691dccb1edb9677f: Base for randomization
- 021182e52fe01c1f7b126f97fd6ba048dc4234fd: Enable for PAGE_OFFSET

---
 kexec/arch/i386/crashdump-x86.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
kexec/arch/i386/crashdump-x86.c +0 -0
index bbc0f35..ab833d4 100644

kexec/arch/i386/crashdump-x86.c static int get_kernel_paddr(struct kexec_info *UNUSED(info), · line 106

Quoted 7 lines
kexec/arch/i386/crashdump-x86.c +2 -2
@@ -102,11 +102,10 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),
 	return -1;
 }
 
-/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */
-static unsigned long long get_kernel_stext_sym(void)
+/* Retrieve kernel symbol virtual address from /proc/kallsyms */
+static unsigned long long get_kernel_sym(const char *symbol)

It sounds better to split this to another patch.

Quoted 65 lines
kexec/arch/i386/crashdump-x86.c +20 -5
 {
 	const char *kallsyms = "/proc/kallsyms";
-	const char *stext = "_stext";
 	char sym[128];
 	char line[128];
 	FILE *fp;
@@ -122,13 +121,13 @@ static unsigned long long get_kernel_stext_sym(void)
 	while(fgets(line, sizeof(line), fp) != NULL) {
 		if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)
 			continue;
-		if (strcmp(sym, stext) == 0) {
-			dbgprintf("kernel symbol %s vaddr = %16llx\n", stext, vaddr);
+		if (strcmp(sym, symbol) == 0) {
+			dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);
 			return vaddr;
 		}
 	}
 
-	fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);
+	fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);
 	return 0;
 }
 
@@ -151,6 +150,8 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 	off_t size;
 	uint32_t elf_flags = 0;
 	uint64_t stext_sym;
+	const unsigned long long pud_mask = ~((1 << 30) - 1);
+	unsigned long long vaddr, lowest_vaddr = 0;
 
 	if (elf_info->machine != EM_X86_64)
 		return 0;
@@ -180,9 +181,23 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 
 	end_phdr = &ehdr.e_phdr[ehdr.e_phnum];
 
+	/* Search for the real PAGE_OFFSET when KASLR memory randomization
+	 * is enabled */
+	if (get_kernel_sym("page_offset_base") != 0) {
+		for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) {
+			if (phdr->p_type == PT_LOAD) {
+				vaddr = phdr->p_vaddr & pud_mask;
+				if (lowest_vaddr == 0 || lowest_vaddr > vaddr)
+					lowest_vaddr = vaddr;
+			}
+		}
+		if (lowest_vaddr != 0)
+			elf_info->page_offset = lowest_vaddr;
+	}
+
 	/* Traverse through the Elf headers and find the region where
 	 * _stext symbol is located in. That's where kernel is mapped */
-	stext_sym = get_kernel_stext_sym();
+	stext_sym = get_kernel_sym("_stext");
 	for(phdr = ehdr.e_phdr; stext_sym && phdr != end_phdr; phdr++) {
 		if (phdr->p_type == PT_LOAD) {
 			unsigned long long saddr = phdr->p_vaddr;
Signature · 7 lines
2.8.0.rc3.226.g39d4020


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Thanks
Dave

#4 lore raw
Quoted 8 lines · Dave Young

Hi, Thomas

Quoted 4 lines · Thomas Garnier

Multiple changes were made on KASLR (right now in linux-next). One of them is randomizing the virtual address of the physical mapping, vmalloc and vmemmap memory sections. It breaks kdump ability to read physical memory.

Quoted 5 lines

What is the user visible behavior without this patch? Could you add more in the patch log?

During my testing seems with or without this patch kdump kernel boot both fine.

Without this patch, you can't access memory on the generated crash dumps.

Quoted 8 lines

My kernel config options is like below, is it enough to test this patch? CONFIG_RANDOMIZE_BASE=y
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0

Should be good enough.

Quoted 23 lines
Quoted 23 lines

This change identifies if KASLR memories randomization is used by checking if the page_offset_base variable exists. It search for the correct PAGE_OFFSET value by looking at the loaded memory section and find the lowest aligned on PUD (the randomization level).

Related commits on linux-next:
- 0483e1fa6e09d4948272680f691dccb1edb9677f: Base for randomization
- 021182e52fe01c1f7b126f97fd6ba048dc4234fd: Enable for PAGE_OFFSET

---
 kexec/arch/i386/crashdump-x86.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
kexec/arch/i386/crashdump-x86.c +0 -0
index bbc0f35..ab833d4 100644
@@ -102,11 +102,10 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),
      return -1;
 }
 
Quoted 7 lines

kexec/arch/i386/crashdump-x86.c static int get_kernel_paddr(struct kexec_info *UNUSED(info), · line 106

Quoted 4 lines
kexec/arch/i386/crashdump-x86.c +2 -2
-/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */
-static unsigned long long get_kernel_stext_sym(void)
+/* Retrieve kernel symbol virtual address from /proc/kallsyms */
+static unsigned long long get_kernel_sym(const char *symbol)

It sounds better to split this to another patch.

Why not, that's a very small change though.

Quoted 68 lines
Quoted 61 lines
kexec/arch/i386/crashdump-x86.c +20 -6
 {
      const char *kallsyms = "/proc/kallsyms";
-     const char *stext = "_stext";
      char sym[128];
      char line[128];
      FILE *fp;
@@ -122,13 +121,13 @@ static unsigned long long get_kernel_stext_sym(void)
      while(fgets(line, sizeof(line), fp) != NULL) {
              if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)
                      continue;
-             if (strcmp(sym, stext) == 0) {
-                     dbgprintf("kernel symbol %s vaddr = %16llx\n", stext, vaddr);
+             if (strcmp(sym, symbol) == 0) {
+                     dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);
                      return vaddr;
              }
      }
 
-     fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);
+     fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);
      return 0;
 }
 
@@ -151,6 +150,8 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
      off_t size;
      uint32_t elf_flags = 0;
      uint64_t stext_sym;
+     const unsigned long long pud_mask = ~((1 << 30) - 1);
+     unsigned long long vaddr, lowest_vaddr = 0;
 
      if (elf_info->machine != EM_X86_64)
              return 0;
@@ -180,9 +181,23 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 
      end_phdr = &ehdr.e_phdr[ehdr.e_phnum];
 
+     /* Search for the real PAGE_OFFSET when KASLR memory randomization
+      * is enabled */
+     if (get_kernel_sym("page_offset_base") != 0) {
+             for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) {
+                     if (phdr->p_type == PT_LOAD) {
+                             vaddr = phdr->p_vaddr & pud_mask;
+                             if (lowest_vaddr == 0 || lowest_vaddr > vaddr)
+                                     lowest_vaddr = vaddr;
+                     }
+             }
+             if (lowest_vaddr != 0)
+                     elf_info->page_offset = lowest_vaddr;
+     }
+
      /* Traverse through the Elf headers and find the region where
       * _stext symbol is located in. That's where kernel is mapped */
-     stext_sym = get_kernel_stext_sym();
+     stext_sym = get_kernel_sym("_stext");
      for(phdr = ehdr.e_phdr; stext_sym && phdr != end_phdr; phdr++) {
              if (phdr->p_type == PT_LOAD) {
                      unsigned long long saddr = phdr->p_vaddr;
--

2.8.0.rc3.226.g39d4020

Quoted 4 lines

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

Thanks
Dave

#5 lore raw
Quoted 9 lines · Thomas Garnier
Quoted 8 lines · Dave Young

Hi, Thomas

Quoted 4 lines · Thomas Garnier

Multiple changes were made on KASLR (right now in linux-next). One of them is randomizing the virtual address of the physical mapping, vmalloc and vmemmap memory sections. It breaks kdump ability to read physical memory.

Quoted 7 lines
Quoted 5 lines

What is the user visible behavior without this patch? Could you add more in the patch log?

During my testing seems with or without this patch kdump kernel boot both fine.

Without this patch, you can't access memory on the generated crash dumps.

Ok, makedumpfile saving /proc/vmcore works fine without this patch, but gdb will give error when accessing the old memory.

Quoted 63 lines
Quoted 9 lines

My kernel config options is like below, is it enough to test this patch? CONFIG_RANDOMIZE_BASE=y
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0

Should be good enough.

Quoted 23 lines
Quoted 23 lines

This change identifies if KASLR memories randomization is used by checking if the page_offset_base variable exists. It search for the correct PAGE_OFFSET value by looking at the loaded memory section and find the lowest aligned on PUD (the randomization level).

Related commits on linux-next:
- 0483e1fa6e09d4948272680f691dccb1edb9677f: Base for randomization
- 021182e52fe01c1f7b126f97fd6ba048dc4234fd: Enable for PAGE_OFFSET

---
 kexec/arch/i386/crashdump-x86.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
kexec/arch/i386/crashdump-x86.c +0 -0
index bbc0f35..ab833d4 100644
@@ -102,11 +102,10 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),
      return -1;
 }
 
Quoted 7 lines

kexec/arch/i386/crashdump-x86.c static int get_kernel_paddr(struct kexec_info *UNUSED(info), · line 106

Quoted 4 lines
kexec/arch/i386/crashdump-x86.c +2 -2
-/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */
-static unsigned long long get_kernel_stext_sym(void)
+/* Retrieve kernel symbol virtual address from /proc/kallsyms */
+static unsigned long long get_kernel_sym(const char *symbol)

It sounds better to split this to another patch.

Why not, that's a very small change though.

Quoted 18 lines
Quoted 18 lines
kexec/arch/i386/crashdump-x86.c +2 -3
 {
      const char *kallsyms = "/proc/kallsyms";
-     const char *stext = "_stext";
      char sym[128];
      char line[128];
      FILE *fp;
@@ -122,13 +121,13 @@ static unsigned long long get_kernel_stext_sym(void)
      while(fgets(line, sizeof(line), fp) != NULL) {
              if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)
                      continue;
-             if (strcmp(sym, stext) == 0) {
-                     dbgprintf("kernel symbol %s vaddr = %16llx\n", stext, vaddr);
+             if (strcmp(sym, symbol) == 0) {
+                     dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);
                      return vaddr;
              }
      }
 
Quoted 2 lines
Quoted 2 lines

kexec/arch/i386/crashdump-x86.c static unsigned long long get_kernel_stext_sym(void) · line 130

Quoted 2 lines
kexec/arch/i386/crashdump-x86.c +1 -1
-     fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);
+     fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);

For page_offset_base it should only print the error message when the kernel supports it.

Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
kexec/arch/i386/crashdump-x86.c +16 -0
      return 0;
 }
 
@@ -151,6 +150,8 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
      off_t size;
      uint32_t elf_flags = 0;
      uint64_t stext_sym;
+     const unsigned long long pud_mask = ~((1 << 30) - 1);
+     unsigned long long vaddr, lowest_vaddr = 0;
 
      if (elf_info->machine != EM_X86_64)
              return 0;
@@ -180,9 +181,23 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 
      end_phdr = &ehdr.e_phdr[ehdr.e_phnum];
 
+     /* Search for the real PAGE_OFFSET when KASLR memory randomization
+      * is enabled */
+     if (get_kernel_sym("page_offset_base") != 0) {
+             for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) {
+                     if (phdr->p_type == PT_LOAD) {
+                             vaddr = phdr->p_vaddr & pud_mask;
+                             if (lowest_vaddr == 0 || lowest_vaddr > vaddr)
+                                     lowest_vaddr = vaddr;
+                     }
+             }
+             if (lowest_vaddr != 0)
+                     elf_info->page_offset = lowest_vaddr;
+     }
+
Quoted 8 lines
Quoted 8 lines

kexec/arch/i386/crashdump-x86.c static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),

Quoted 8 lines
kexec/arch/i386/crashdump-x86.c +1 -2
      /* Traverse through the Elf headers and find the region where
       * _stext symbol is located in. That's where kernel is mapped */
-     stext_sym = get_kernel_stext_sym();
+     stext_sym = get_kernel_sym("_stext");
      for(phdr = ehdr.e_phdr; stext_sym && phdr != end_phdr; phdr++) {
              if (phdr->p_type == PT_LOAD) {
                      unsigned long long saddr = phdr->p_vaddr;
--

Thanks
Dave

#6 lore raw
Quoted 13 lines · Dave Young
Quoted 12 lines · Thomas Garnier
Quoted 11 lines · Dave Young

Hi, Thomas

Quoted 4 lines · Thomas Garnier

Multiple changes were made on KASLR (right now in linux-next). One of them is randomizing the virtual address of the physical mapping, vmalloc and vmemmap memory sections. It breaks kdump ability to read physical memory.

What is the user visible behavior without this patch? Could you add more in the patch log?

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

During my testing seems with or without this patch kdump kernel boot both fine.

Without this patch, you can't access memory on the generated crash dumps.

Ok, makedumpfile saving /proc/vmcore works fine without this patch, but gdb will give error when accessing the old memory.

Yes, that's correct.

Quoted 63 lines
Quoted 63 lines
Quoted 9 lines

My kernel config options is like below, is it enough to test this patch? CONFIG_RANDOMIZE_BASE=y
CONFIG_X86_NEED_RELOCS=y
CONFIG_PHYSICAL_ALIGN=0x1000000
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0x0

Should be good enough.

Quoted 23 lines
Quoted 23 lines

This change identifies if KASLR memories randomization is used by checking if the page_offset_base variable exists. It search for the correct PAGE_OFFSET value by looking at the loaded memory section and find the lowest aligned on PUD (the randomization level).

Related commits on linux-next:
- 0483e1fa6e09d4948272680f691dccb1edb9677f: Base for randomization
- 021182e52fe01c1f7b126f97fd6ba048dc4234fd: Enable for PAGE_OFFSET

---
 kexec/arch/i386/crashdump-x86.c | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)
kexec/arch/i386/crashdump-x86.c +0 -0
index bbc0f35..ab833d4 100644
@@ -102,11 +102,10 @@ static int get_kernel_paddr(struct kexec_info *UNUSED(info),
      return -1;
 }
 
Quoted 7 lines

kexec/arch/i386/crashdump-x86.c static int get_kernel_paddr(struct kexec_info *UNUSED(info), · line 106

Quoted 4 lines
kexec/arch/i386/crashdump-x86.c +2 -2
-/* Retrieve kernel _stext symbol virtual address from /proc/kallsyms */
-static unsigned long long get_kernel_stext_sym(void)
+/* Retrieve kernel symbol virtual address from /proc/kallsyms */
+static unsigned long long get_kernel_sym(const char *symbol)

It sounds better to split this to another patch.

Why not, that's a very small change though.

Quoted 18 lines
Quoted 18 lines
kexec/arch/i386/crashdump-x86.c +2 -3
 {
      const char *kallsyms = "/proc/kallsyms";
-     const char *stext = "_stext";
      char sym[128];
      char line[128];
      FILE *fp;
@@ -122,13 +121,13 @@ static unsigned long long get_kernel_stext_sym(void)
      while(fgets(line, sizeof(line), fp) != NULL) {
              if (sscanf(line, "%Lx %c %s", &vaddr, &type, sym) != 3)
                      continue;
-             if (strcmp(sym, stext) == 0) {
-                     dbgprintf("kernel symbol %s vaddr = %16llx\n", stext, vaddr);
+             if (strcmp(sym, symbol) == 0) {
+                     dbgprintf("kernel symbol %s vaddr = %16llx\n", symbol, vaddr);
                      return vaddr;
              }
      }
 
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines

kexec/arch/i386/crashdump-x86.c static unsigned long long get_kernel_stext_sym(void) · line 130

Quoted 2 lines
kexec/arch/i386/crashdump-x86.c +1 -1
-     fprintf(stderr, "Cannot get kernel %s symbol address\n", stext);
+     fprintf(stderr, "Cannot get kernel %s symbol address\n", symbol);

For page_offset_base it should only print the error message when the kernel supports it.

I agree that would be better. How do we know if the kernel supports it though?

I can't think of a reliable way to detect if KASLR is enabled. I think Kees told me there was no official way on purpose.

Quoted 42 lines
Quoted 31 lines
Quoted 31 lines
Quoted 31 lines
kexec/arch/i386/crashdump-x86.c +16 -0
      return 0;
 }
 
@@ -151,6 +150,8 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
      off_t size;
      uint32_t elf_flags = 0;
      uint64_t stext_sym;
+     const unsigned long long pud_mask = ~((1 << 30) - 1);
+     unsigned long long vaddr, lowest_vaddr = 0;
 
      if (elf_info->machine != EM_X86_64)
              return 0;
@@ -180,9 +181,23 @@ static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),
 
      end_phdr = &ehdr.e_phdr[ehdr.e_phnum];
 
+     /* Search for the real PAGE_OFFSET when KASLR memory randomization
+      * is enabled */
+     if (get_kernel_sym("page_offset_base") != 0) {
+             for(phdr = ehdr.e_phdr; phdr != end_phdr; phdr++) {
+                     if (phdr->p_type == PT_LOAD) {
+                             vaddr = phdr->p_vaddr & pud_mask;
+                             if (lowest_vaddr == 0 || lowest_vaddr > vaddr)
+                                     lowest_vaddr = vaddr;
+                     }
+             }
+             if (lowest_vaddr != 0)
+                     elf_info->page_offset = lowest_vaddr;
+     }
+
Quoted 8 lines
Quoted 8 lines

kexec/arch/i386/crashdump-x86.c static int get_kernel_vaddr_and_size(struct kexec_info *UNUSED(info),

Quoted 8 lines
kexec/arch/i386/crashdump-x86.c +1 -2
      /* Traverse through the Elf headers and find the region where
       * _stext symbol is located in. That's where kernel is mapped */
-     stext_sym = get_kernel_stext_sym();
+     stext_sym = get_kernel_sym("_stext");
      for(phdr = ehdr.e_phdr; stext_sym && phdr != end_phdr; phdr++) {
              if (phdr->p_type == PT_LOAD) {
                      unsigned long long saddr = phdr->p_vaddr;
--

Thanks
Dave