From 55f280c90ed7288b392fcf718efc2d3caca11e91 Mon Sep 17 00:00:00 2001 From: balrog Date: Tue, 28 Oct 2008 10:24:11 +0000 Subject: [PATCH] page_check_range: fix wrap around test (Lauro Ramos Venancio). Move up the warp around test because line 'end = TARGET_PAGE_ALIGN(start+len);' can interfere with it. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5563 c046a42c-6fe2-441c-8c8c-71466251a162 --- exec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/exec.c b/exec.c index f1fcec833c..697a19eb25 100644 --- a/exec.c +++ b/exec.c @@ -2081,12 +2081,13 @@ int page_check_range(target_ulong start, target_ulong len, int flags) target_ulong end; target_ulong addr; + if (start + len < start) + /* we've wrapped around */ + return -1; + end = TARGET_PAGE_ALIGN(start+len); /* must do before we loose bits in the next step */ start = start & TARGET_PAGE_MASK; - if( end < start ) - /* we've wrapped around */ - return -1; for(addr = start; addr < end; addr += TARGET_PAGE_SIZE) { p = page_find(addr >> TARGET_PAGE_BITS); if( !p ) -- 2.11.4.GIT