|
@@ -1945,6 +1945,15 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
|
* get_user_pages(.write=1, .force=1).
|
|
|
*/
|
|
|
if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
|
|
|
+ struct vm_fault vmf;
|
|
|
+ int tmp;
|
|
|
+
|
|
|
+ vmf.virtual_address = (void __user *)(address &
|
|
|
+ PAGE_MASK);
|
|
|
+ vmf.pgoff = old_page->index;
|
|
|
+ vmf.flags = FAULT_FLAG_WRITE|FAULT_FLAG_MKWRITE;
|
|
|
+ vmf.page = old_page;
|
|
|
+
|
|
|
/*
|
|
|
* Notify the address space that the page is about to
|
|
|
* become writable so that it can prohibit this or wait
|
|
@@ -1956,8 +1965,12 @@ static int do_wp_page(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
|
page_cache_get(old_page);
|
|
|
pte_unmap_unlock(page_table, ptl);
|
|
|
|
|
|
- if (vma->vm_ops->page_mkwrite(vma, old_page) < 0)
|
|
|
+ tmp = vma->vm_ops->page_mkwrite(vma, &vmf);
|
|
|
+ if (unlikely(tmp &
|
|
|
+ (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) {
|
|
|
+ ret = tmp;
|
|
|
goto unwritable_page;
|
|
|
+ }
|
|
|
|
|
|
/*
|
|
|
* Since we dropped the lock we need to revalidate
|
|
@@ -2106,7 +2119,7 @@ oom:
|
|
|
|
|
|
unwritable_page:
|
|
|
page_cache_release(old_page);
|
|
|
- return VM_FAULT_SIGBUS;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -2648,9 +2661,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
|
|
|
* to become writable
|
|
|
*/
|
|
|
if (vma->vm_ops->page_mkwrite) {
|
|
|
+ int tmp;
|
|
|
+
|
|
|
unlock_page(page);
|
|
|
- if (vma->vm_ops->page_mkwrite(vma, page) < 0) {
|
|
|
- ret = VM_FAULT_SIGBUS;
|
|
|
+ vmf.flags |= FAULT_FLAG_MKWRITE;
|
|
|
+ tmp = vma->vm_ops->page_mkwrite(vma, &vmf);
|
|
|
+ if (unlikely(tmp &
|
|
|
+ (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) {
|
|
|
+ ret = tmp;
|
|
|
anon = 1; /* no anon but release vmf.page */
|
|
|
goto out_unlocked;
|
|
|
}
|