Commit 450abddb authored by James Hogan's avatar James Hogan Committed by Greg Kroah-Hartman

MIPS: vDSO: Fix Malta EVA mapping to vDSO page structs

commit 554af0c3 upstream.

The page structures associated with the vDSO pages in the kernel image
are calculated using virt_to_page(), which uses __pa() under the hood to
find the pfn associated with the virtual address. The vDSO data pointers
however point to kernel symbols, so __pa_symbol() should really be used
instead.

Since there is no equivalent to virt_to_page() which uses __pa_symbol(),
fix init_vdso_image() to work directly with pfns, calculated with
__phys_to_pfn(__pa_symbol(...)).

This issue broke the Malta Enhanced Virtual Addressing (EVA)
configuration which has a non-default implementation of __pa_symbol().
This is because it uses a physical alias so that the kernel executes
from KSeg0 (VA 0x80000000 -> PA 0x00000000), while RAM is provided to
the kernel in the KUSeg range (VA 0x00000000 -> PA 0x80000000) which
uses the same underlying RAM.

Since there are no page structures associated with the low physical
address region, some arbitrary kernel memory would be interpreted as a
page structure for the vDSO pages and badness ensues.

Fixes: ebb5e78c ("MIPS: Initial implementation of a VDSO")
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Leonid Yegoshin <leonid.yegoshin@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14229/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8a84b84
...@@ -39,16 +39,16 @@ static struct vm_special_mapping vdso_vvar_mapping = { ...@@ -39,16 +39,16 @@ static struct vm_special_mapping vdso_vvar_mapping = {
static void __init init_vdso_image(struct mips_vdso_image *image) static void __init init_vdso_image(struct mips_vdso_image *image)
{ {
unsigned long num_pages, i; unsigned long num_pages, i;
unsigned long data_pfn;
BUG_ON(!PAGE_ALIGNED(image->data)); BUG_ON(!PAGE_ALIGNED(image->data));
BUG_ON(!PAGE_ALIGNED(image->size)); BUG_ON(!PAGE_ALIGNED(image->size));
num_pages = image->size / PAGE_SIZE; num_pages = image->size / PAGE_SIZE;
for (i = 0; i < num_pages; i++) { data_pfn = __phys_to_pfn(__pa_symbol(image->data));
image->mapping.pages[i] = for (i = 0; i < num_pages; i++)
virt_to_page(image->data + (i * PAGE_SIZE)); image->mapping.pages[i] = pfn_to_page(data_pfn + i);
}
} }
static int __init init_vdso(void) static int __init init_vdso(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment