diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:39:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:39:59 +0200 |
| commit | 0679c2f47d50651018dd5e0bf35330f6e6ae35ec (patch) | |
| tree | 2df65ebb958f930abf0b7ad35fd6e528398b1679 /mm/mprotect.c | |
| parent | 76fbc263ff7e42ce8b21b8aee176e3c74b45f81a (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
| download | kernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.tar.gz kernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.tar.xz kernel-crypto-0679c2f47d50651018dd5e0bf35330f6e6ae35ec.zip | |
Merge branch 'linus' into pci-for-jesse
Diffstat (limited to 'mm/mprotect.c')
| -rw-r--r-- | mm/mprotect.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index a5bf31c2737..360d9cc8b38 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -47,19 +47,17 @@ static void change_pte_range(struct mm_struct *mm, pmd_t *pmd, if (pte_present(oldpte)) { pte_t ptent; - /* Avoid an SMP race with hardware updated dirty/clean - * bits by wiping the pte and then setting the new pte - * into place. - */ - ptent = ptep_get_and_clear(mm, addr, pte); + ptent = ptep_modify_prot_start(mm, addr, pte); ptent = pte_modify(ptent, newprot); + /* * Avoid taking write faults for pages we know to be * dirty. */ if (dirty_accountable && pte_dirty(ptent)) ptent = pte_mkwrite(ptent); - set_pte_at(mm, addr, pte, ptent); + + ptep_modify_prot_commit(mm, addr, pte, ptent); #ifdef CONFIG_MIGRATION } else if (!pte_file(oldpte)) { swp_entry_t entry = pte_to_swp_entry(oldpte); @@ -239,7 +237,7 @@ sys_mprotect(unsigned long start, size_t len, unsigned long prot) end = start + len; if (end <= start) return -ENOMEM; - if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM)) + if (!arch_validate_prot(prot)) return -EINVAL; reqprot = prot; |