fs/proc/kcore.c: use __pa_symbol() for KCORE_TEXT list entries
[ Upstream commit df865e8337
]
elf_kcore_store_hdr() uses __pa() to find the physical address of
KCORE_RAM or KCORE_TEXT entries exported as program headers.
This trips CONFIG_DEBUG_VIRTUAL's checks, as the KCORE_TEXT entries are
not in the linear map.
Handle these two cases separately, using __pa_symbol() for the KCORE_TEXT
entries.
Link: http://lkml.kernel.org/r/20180711131944.15252-1-james.morse@arm.com
Signed-off-by: James Morse <james.morse@arm.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Omar Sandoval <osandov@fb.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
68e787c3c8
Коммит
305277dae9
|
@ -384,8 +384,10 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff)
|
|||
phdr->p_flags = PF_R|PF_W|PF_X;
|
||||
phdr->p_offset = kc_vaddr_to_offset(m->addr) + dataoff;
|
||||
phdr->p_vaddr = (size_t)m->addr;
|
||||
if (m->type == KCORE_RAM || m->type == KCORE_TEXT)
|
||||
if (m->type == KCORE_RAM)
|
||||
phdr->p_paddr = __pa(m->addr);
|
||||
else if (m->type == KCORE_TEXT)
|
||||
phdr->p_paddr = __pa_symbol(m->addr);
|
||||
else
|
||||
phdr->p_paddr = (elf_addr_t)-1;
|
||||
phdr->p_filesz = phdr->p_memsz = m->size;
|
||||
|
|
Загрузка…
Ссылка в новой задаче