proc/kcore: Use __pa_symbol() for KCORE_TEXT list entries
Subsystems (3)
PATCH 1/1 proc/kcore: Use __pa_symbol() for KCORE_TEXT list entries
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.
Signed-off-by James Morse <[email protected]>
---
This will clash with a series from Omar:
https://lkml.org/lkml/2018/7/6/868
fs/proc/kcore.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/proc/kcore.c +3 -1
@@ -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;
Signature · 1 line
2.18.0