diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2017-02-24 17:59:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-24 20:46:56 -0500 |
commit | 595cd8f256d24face93b2722927ec9c980419c26 (patch) | |
tree | 4884ad51a34aa931eef71932ed7546ab390f51ef /include/asm-generic/pgtable.h | |
parent | 288bc54949fc2625a4fd811a188fb200cc498946 (diff) |
mm/ksm: handle protnone saved writes when making page write protect
Without this KSM will consider the page write protected, but a numa
fault can later mark the page writable. This can result in memory
corruption.
Link: http://lkml.kernel.org/r/1487498625-10891-3-git-send-email-aneesh.kumar@linux.vnet.ibm.com
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic/pgtable.h')
-rw-r--r-- | include/asm-generic/pgtable.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index 6265411eb2ed..f4ca23b158b3 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
@@ -233,6 +233,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres | |||
233 | #define pte_mk_savedwrite pte_mkwrite | 233 | #define pte_mk_savedwrite pte_mkwrite |
234 | #endif | 234 | #endif |
235 | 235 | ||
236 | #ifndef pte_clear_savedwrite | ||
237 | #define pte_clear_savedwrite pte_wrprotect | ||
238 | #endif | ||
239 | |||
236 | #ifndef pmd_savedwrite | 240 | #ifndef pmd_savedwrite |
237 | #define pmd_savedwrite pmd_write | 241 | #define pmd_savedwrite pmd_write |
238 | #endif | 242 | #endif |
@@ -241,6 +245,10 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres | |||
241 | #define pmd_mk_savedwrite pmd_mkwrite | 245 | #define pmd_mk_savedwrite pmd_mkwrite |
242 | #endif | 246 | #endif |
243 | 247 | ||
248 | #ifndef pmd_clear_savedwrite | ||
249 | #define pmd_clear_savedwrite pmd_wrprotect | ||
250 | #endif | ||
251 | |||
244 | #ifndef __HAVE_ARCH_PMDP_SET_WRPROTECT | 252 | #ifndef __HAVE_ARCH_PMDP_SET_WRPROTECT |
245 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 253 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
246 | static inline void pmdp_set_wrprotect(struct mm_struct *mm, | 254 | static inline void pmdp_set_wrprotect(struct mm_struct *mm, |