shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: mm: page_pinner: use put_user_page at unstable_tree_search_insert

Browse Source 
KSM uses follow_page with FOLL_GET at several places so they should
use put_user_page to avoid page_pinner false positive.

Bug: 183414571
Signed-off-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Minchan Kim <minchan@google.com>
Change-Id: I0234eeb5db7d801e70c4884146c3029582b715c1
This commit is contained in:
Minchan Kim
2021-03-23 10:42:09 -07:00
committed by Minchan Kim
parent c2b7c24bc1
commit d600eedfb6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mm/ksm.c
View File

@@ -484,7 +484,7 @@ static int break_ksm(struct vm_area_struct *vma, unsigned long addr)
NULL); NULL);
else else
ret = VM_FAULT_WRITE; ret = VM_FAULT_WRITE;
put_page(page); put_user_page(page);
} while (!(ret & (VM_FAULT_WRITE | VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV | VM_FAULT_OOM))); } while (!(ret & (VM_FAULT_WRITE | VM_FAULT_SIGBUS | VM_FAULT_SIGSEGV | VM_FAULT_OOM)));
/* /*
* We must loop because handle_mm_fault() may back out if there's * We must loop because handle_mm_fault() may back out if there's
@@ -569,7 +569,7 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item)
flush_anon_page(vma, page, addr); flush_anon_page(vma, page, addr);
flush_dcache_page(page); flush_dcache_page(page);
} else { } else {
put_page(page); put_user_page(page);
out: out:
page = NULL; page = NULL;
} }
@@ -1949,7 +1949,7 @@ struct rmap_item *unstable_tree_search_insert(struct rmap_item *rmap_item,
* Don't substitute a ksm page for a forked page. * Don't substitute a ksm page for a forked page.
*/ */
if (page == tree_page) { if (page == tree_page) {
put_page(tree_page); put_user_page(tree_page);
return NULL; return NULL;
} }
@@ -1957,10 +1957,10 @@ struct rmap_item *unstable_tree_search_insert(struct rmap_item *rmap_item,
parent = *new; parent = *new;
if (ret < 0) { if (ret < 0) {
put_page(tree_page); put_user_page(tree_page);
new = &parent->rb_left; new = &parent->rb_left;
} else if (ret > 0) { } else if (ret > 0) {
put_page(tree_page); put_user_page(tree_page);
new = &parent->rb_right; new = &parent->rb_right;
} else if (!ksm_merge_across_nodes && } else if (!ksm_merge_across_nodes &&
page_to_nid(tree_page) != nid) { page_to_nid(tree_page) != nid) {
@@ -1969,7 +1969,7 @@ struct rmap_item *unstable_tree_search_insert(struct rmap_item *rmap_item,
* it will be flushed out and put in the right unstable * it will be flushed out and put in the right unstable
* tree next time: only merge with it when across_nodes. * tree next time: only merge with it when across_nodes.
*/ */
put_page(tree_page); put_user_page(tree_page);
return NULL; return NULL;
} else { } else {
*tree_pagep = tree_page; *tree_pagep = tree_page;
@@ -2150,7 +2150,7 @@ static void cmp_and_merge_page(struct page *page, struct rmap_item *rmap_item)
*/ */
split = PageTransCompound(page) split = PageTransCompound(page)
&& compound_head(page) == compound_head(tree_page); && compound_head(page) == compound_head(tree_page);
put_page(tree_page); put_user_page(tree_page);
if (kpage) { if (kpage) {
/* /*
* The pages were successfully merged: insert new * The pages were successfully merged: insert new
@@ -2319,11 +2319,11 @@ next_mm:
&rmap_item->rmap_list; &rmap_item->rmap_list;
ksm_scan.address += PAGE_SIZE; ksm_scan.address += PAGE_SIZE;
} else } else
put_page(*page); put_user_page(*page);
mmap_read_unlock(mm); mmap_read_unlock(mm);
return rmap_item; return rmap_item;
} }
put_page(*page); put_user_page(*page);
ksm_scan.address += PAGE_SIZE; ksm_scan.address += PAGE_SIZE;
cond_resched(); cond_resched();
} }