[Xen-changelog] [xen-unstable] x86: Fix guest-pointer-array memmove in __pirq_guest_unbind().

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1275040447 -3600
# Node ID 96917cf25bf3ad42c6b6cddb7ff4f03857ae9619
# Parent  95acf74586d782d8d4d39016b3426a1eae127e97
x86: Fix guest-pointer-array memmove in __pirq_guest_unbind().

Thanks to Alex Zefefrt for finding this.

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/arch/x86/irq.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 95acf74586d7 -r 96917cf25bf3 xen/arch/x86/irq.c
--- a/xen/arch/x86/irq.c        Fri May 28 09:45:50 2010 +0100
+++ b/xen/arch/x86/irq.c        Fri May 28 10:54:07 2010 +0100
@@ -1243,7 +1243,8 @@ static irq_guest_action_t *__pirq_guest_
     for ( i = 0; (i < action->nr_guests) && (action->guest[i] != d); i++ )
         continue;
     BUG_ON(i == action->nr_guests);
-    memmove(&action->guest[i], &action->guest[i+1], IRQ_MAX_GUESTS-i-1);
+    memmove(&action->guest[i], &action->guest[i+1],
+            (action->nr_guests-i-1) * sizeof(action->guest[0]));
     action->nr_guests--;
 
     switch ( action->ack_type )

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog