Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit a0b1280

Browse files
kiryltorvalds
authored andcommitted
kdump: write correct address of mem_section into vmcoreinfo
Depending on configuration mem_section can now be an array or a pointer to an array allocated dynamically. In most cases, we can continue to refer to it as 'mem_section' regardless of what it is. But there's one exception: '&mem_section' means "address of the array" if mem_section is an array, but if mem_section is a pointer, it would mean "address of the pointer". We've stepped onto this in kdump code. VMCOREINFO_SYMBOL(mem_section) writes down address of pointer into vmcoreinfo, not array as we wanted. Let's introduce VMCOREINFO_SYMBOL_ARRAY() that would handle the situation correctly for both cases. Link: http://lkml.kernel.org/r/20180112162532.35896-1-kirill.shutemov@linux.intel.com Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Fixes: 83e3c48 ("mm/sparsemem: Allocate mem_section at runtime for CONFIG_SPARSEMEM_EXTREME=y") Acked-by: Baoquan He <bhe@redhat.com> Acked-by: Dave Young <dyoung@redhat.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Dave Young <dyoung@redhat.com> Cc: Baoquan He <bhe@redhat.com> Cc: Vivek Goyal <vgoyal@redhat.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent d9570ee commit a0b1280

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

include/linux/crash_core.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ phys_addr_t paddr_vmcoreinfo_note(void);
4242
vmcoreinfo_append_str("PAGESIZE=%ld\n", value)
4343
#define VMCOREINFO_SYMBOL(name) \
4444
vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)&name)
45+
#define VMCOREINFO_SYMBOL_ARRAY(name) \
46+
vmcoreinfo_append_str("SYMBOL(%s)=%lx\n", #name, (unsigned long)name)
4547
#define VMCOREINFO_SIZE(name) \
4648
vmcoreinfo_append_str("SIZE(%s)=%lu\n", #name, \
4749
(unsigned long)sizeof(name))

kernel/crash_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ static int __init crash_save_vmcoreinfo_init(void)
410410
VMCOREINFO_SYMBOL(contig_page_data);
411411
#endif
412412
#ifdef CONFIG_SPARSEMEM
413-
VMCOREINFO_SYMBOL(mem_section);
413+
VMCOREINFO_SYMBOL_ARRAY(mem_section);
414414
VMCOREINFO_LENGTH(mem_section, NR_SECTION_ROOTS);
415415
VMCOREINFO_STRUCT_SIZE(mem_section);
416416
VMCOREINFO_OFFSET(mem_section, section_mem_map);

0 commit comments

Comments
 (0)