Skip to content

Commit

Permalink
[PATCH] try_to_unmap_cluster() passes out-of-bounds pte to pte_unmap()
Browse files Browse the repository at this point in the history
try_to_unmap_cluster() does:
        for (pte = pte_offset_map(pmd, address);
                        address < end; pte++, address += PAGE_SIZE) {
		...
	}

	pte_unmap(pte);

It may take a little staring to notice, but pte can actually fall off the
end of the pte page in this iteration, which makes life difficult for
kmap_atomic() and the users not expecting it to BUG().  Of course, we're
somewhat lucky in that arithmetic elsewhere in the function guarantees that
at least one iteration is made, lest this force larger rearrangements to be
made.  This issue and patch also apply to non-mm mainline and with trivial
adjustments, at least two related kernels.

Discovered during internal testing at Oracle.

Signed-off-by: William Irwin <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
William Lee Irwin III authored and Linus Torvalds committed May 25, 2005
1 parent c33880a commit cafdd8b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mm/rmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ static void try_to_unmap_cluster(unsigned long cursor,
pgd_t *pgd;
pud_t *pud;
pmd_t *pmd;
pte_t *pte;
pte_t *pte, *original_pte;
pte_t pteval;
struct page *page;
unsigned long address;
Expand Down Expand Up @@ -658,7 +658,7 @@ static void try_to_unmap_cluster(unsigned long cursor,
if (!pmd_present(*pmd))
goto out_unlock;

for (pte = pte_offset_map(pmd, address);
for (original_pte = pte = pte_offset_map(pmd, address);
address < end; pte++, address += PAGE_SIZE) {

if (!pte_present(*pte))
Expand Down Expand Up @@ -694,7 +694,7 @@ static void try_to_unmap_cluster(unsigned long cursor,
(*mapcount)--;
}

pte_unmap(pte);
pte_unmap(original_pte);
out_unlock:
spin_unlock(&mm->page_table_lock);
}
Expand Down

0 comments on commit cafdd8b

Please sign in to comment.