yeahuh / rpms / qemu-kvm

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