From fd39941ac78fbe969e292eeb91415ec548bd97a6 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 29 Jan 2012 16:47:47 +0200 Subject: [PATCH] Fix off-by-one in dirty bitmap functions Reported-by: Stefan Berger Signed-off-by: Avi Kivity Signed-off-by: Blue Swirl --- exec-obsolete.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/exec-obsolete.h b/exec-obsolete.h index 03cf35ecfb..d2749d36fa 100644 --- a/exec-obsolete.h +++ b/exec-obsolete.h @@ -83,9 +83,10 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, uint8_t *p; ram_addr_t addr, end; - end = start + length; + end = TARGET_PAGE_ALIGN(start + length); + start &= TARGET_PAGE_MASK; p = ram_list.phys_dirty + (start >> TARGET_PAGE_BITS); - for (addr = start; addr <= end; addr += TARGET_PAGE_SIZE) { + for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { *p++ |= dirty_flags; } } @@ -98,10 +99,11 @@ static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start, uint8_t *p; ram_addr_t addr, end; - end = start + length; + end = TARGET_PAGE_ALIGN(start + length); + start &= TARGET_PAGE_MASK; mask = ~dirty_flags; p = ram_list.phys_dirty + (start >> TARGET_PAGE_BITS); - for (addr = start; addr <= end; addr += TARGET_PAGE_SIZE) { + for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) { *p++ &= mask; } }