gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split_large_page(): avoid panic when splitting "non-mapped" large pages

Browse Source
This commit is contained in:
Balazs Gerofi
2016-07-14 17:11:52 +09:00
parent 6118faffa9
commit 4c8f583c0c
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/x86/kernel/memory.c
View File

@@ -910,11 +910,17 @@ static int split_large_page(pte_t *ptep, size_t pgsize)
*ptep = (virt_to_phys(pt) & PT_PHYSMASK) | PFL2_PDIR_ATTR; *ptep = (virt_to_phys(pt) & PT_PHYSMASK) | PFL2_PDIR_ATTR;
if (phys_base != NOPHYS) { /* Do not do this check for large pages as they don't come from the zeroobj
page = phys_to_page(phys_base); * and are not actually mapped.
if (page && page_unmap(page)) { * TODO: clean up zeroobj as we don't really need it, anonymous mappings
kprintf("split_large_page:page_unmap:%p\n", page); * should be allocated for real */
panic("split_large_page:page_unmap\n"); if (pgsize != PTL2_SIZE) {
if (phys_base != NOPHYS) {
page = phys_to_page(phys_base);
if (pgsize != PTL2_SIZE && page && page_unmap(page)) {
kprintf("split_large_page:page_unmap:%p\n", page);
panic("split_large_page:page_unmap\n");
}
} }
} }
return 0; return 0;