d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle case when result of pmap_pte is NULL. This issue was uncovered

Browse Source 
by r237367
This commit is contained in:
Oleksandr Tymoshenko 2012-06-25 17:50:11 +00:00
parent 39803b8c58
commit 8696e0cb5b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/mips/mips/pmap.c
View File

@ -765,6 +765,7 @@ pmap_extract(pmap_t pmap, vm_offset_t va)
vm_page_t
pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
{
pt_entry_t *ptep;
pt_entry_t pte;
vm_page_t m;
vm_paddr_t pa;
@ -773,8 +774,9 @@ pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot)
pa = 0;
PMAP_LOCK(pmap);
retry:
pte = *pmap_pte(pmap, va);
if (pte != 0 && pte_test(&pte, PTE_V) &&
ptep = pmap_pte(pmap, va);
if ((ptep != NULL) && ((pte = *ptep) != 0) &&
pte_test(&pte, PTE_V) &&
(pte_test(&pte, PTE_D) || (prot & VM_PROT_WRITE) == 0)) {
if (vm_page_pa_tryrelock(pmap, TLBLO_PTE_TO_PA(pte), &pa))
goto retry;