From 11b9b3f7b11d113e5789877dec1ab41be838c007 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Tue, 14 Jan 2014 15:07:25 +0100 Subject: [PATCH 14/40] memory: make sure that client is always inside range RH-Author: Juan Quintela Message-id: <1389712071-23303-15-git-send-email-quintela@redhat.com> Patchwork-id: 56669 O-Subject: [RHEL7 qemu-kvm PATCH 14/40] memory: make sure that client is always inside range Bugzilla: 997559 RH-Acked-by: Paolo Bonzini RH-Acked-by: Orit Wasserman RH-Acked-by: Dr. David Alan Gilbert (git) Signed-off-by: Juan Quintela Reviewed-by: Eric Blake Reviewed-by: Orit Wasserman (cherry picked from commit 7a5b558c9d061814f34d9b95d70d17ef75037937) Signed-off-by: Juan Quintela --- include/exec/memory-internal.h | 4 ++++ 1 file changed, 4 insertions(+) Signed-off-by: Miroslav Rezanina --- include/exec/memory-internal.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h index fbcd384..ef5de3e 100644 --- a/include/exec/memory-internal.h +++ b/include/exec/memory-internal.h @@ -52,6 +52,7 @@ void qemu_ram_free_from_ptr(ram_addr_t addr); static inline bool cpu_physical_memory_get_dirty_flag(ram_addr_t addr, unsigned client) { + assert(client < DIRTY_MEMORY_NUM); return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] & (1 << client); } @@ -83,6 +84,7 @@ static inline int cpu_physical_memory_get_dirty(ram_addr_t start, static inline void cpu_physical_memory_set_dirty_flag(ram_addr_t addr, unsigned client) { + assert(client < DIRTY_MEMORY_NUM); ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] |= (1 << client); } @@ -98,6 +100,8 @@ static inline int cpu_physical_memory_clear_dirty_flag(ram_addr_t addr, { int mask = ~(1 << client); + assert(client < DIRTY_MEMORY_NUM); + return ram_list.phys_dirty[addr >> TARGET_PAGE_BITS] &= mask; } -- 1.7.1