Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] mbind: fix verify_pages pte_page

Browse source 
Strict mbind's check that pages already mapped are on right node has been
using pte_page without checking if pfn_valid, and without page_table_lock
to prevent spurious failures when try_to_unmap_one intervenes between the
pte_present and the pte_page.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Hugh Dickins 2005-06-21 17:15:06 -07:00 committed by Linus Torvalds
parent 400e65146c
commit 941150a326
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mm/mempolicy.c
View file

@ -242,6 +242,9 @@ static int
verify_pages(struct mm_struct *mm, verify_pages(struct mm_struct *mm,
unsigned long addr, unsigned long end, unsigned long *nodes) unsigned long addr, unsigned long end, unsigned long *nodes)
{ {
int err = 0;
spin_lock(&mm->page_table_lock);
while (addr < end) { while (addr < end) {
struct page *p; struct page *p;
pte_t *pte; pte_t *pte;
@ -268,17 +271,23 @@ verify_pages(struct mm_struct *mm,
} }
p = NULL; p = NULL;
pte = pte_offset_map(pmd, addr); pte = pte_offset_map(pmd, addr);
if (pte_present(*pte)) if (pte_present(*pte)) {
p = pte_page(*pte); unsigned long pfn = pte_pfn(*pte);
if (pfn_valid(pfn))
p = pfn_to_page(pfn);
}
pte_unmap(pte); pte_unmap(pte);
if (p) { if (p) {
unsigned nid = page_to_nid(p); unsigned nid = page_to_nid(p);
if (!test_bit(nid, nodes)) if (!test_bit(nid, nodes)) {
return -EIO; err = -EIO;
break;
}
} }
addr += PAGE_SIZE; addr += PAGE_SIZE;
} }
return 0; spin_unlock(&mm->page_table_lock);
return err;
} }
/* Step 1: check the range */ /* Step 1: check the range */