diff options
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/pageattr.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 5cfc0d4ade5..145f5edf488 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -312,10 +312,10 @@ static int change_page_attr_set(unsigned long addr, int numpages, for (i = 0; i < numpages ; i++) { pte = lookup_address(addr, &level); - if (pte) - current_prot = pte_pgprot(*pte); - else - pgprot_val(current_prot) = 0; + if (!pte) + return -EINVAL; + + current_prot = pte_pgprot(*pte); pgprot_val(new_prot) = pgprot_val(current_prot) | pgprot_val(prot); @@ -356,11 +356,12 @@ static int change_page_attr_clear(unsigned long addr, int numpages, int i, ret; for (i = 0; i < numpages; i++) { + pte = lookup_address(addr, &level); - if (pte) - current_prot = pte_pgprot(*pte); - else - pgprot_val(current_prot) = 0; + if (!pte) + return -EINVAL; + + current_prot = pte_pgprot(*pte); pgprot_val(new_prot) = pgprot_val(current_prot) & ~pgprot_val(prot); |