[Xen-changelog] [xen-unstable] [IA64, PPC] Fix xencomm_add_offset(). index must be incremented.

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

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID d19deb173503962cc42c235cdeda84d3b4a6a52c
# Parent  25e6a17e82f09faf7d728e91e612f9ddd47c73cc
[IA64,PPC] Fix xencomm_add_offset(). index must be incremented.
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/xen/xencomm.c |    7 +++++++
 xen/arch/powerpc/usercopy.c |    7 +++++++
 2 files changed, 14 insertions(+)

diff -r 25e6a17e82f0 -r d19deb173503 xen/arch/ia64/xen/xencomm.c
--- a/xen/arch/ia64/xen/xencomm.c       Fri Nov 10 14:53:00 2006 +0000
+++ b/xen/arch/ia64/xen/xencomm.c       Fri Nov 10 15:27:22 2006 +0000
@@ -345,6 +345,11 @@ xencomm_add_offset(
         unsigned int chunksz;
         unsigned int chunk_skip;
 
+        if (dest_paddr == XENCOMM_INVALID) {
+            i++;
+            continue;
+        }
+
         pgoffset = dest_paddr % PAGE_SIZE;
         chunksz = PAGE_SIZE - pgoffset;
 
@@ -356,6 +361,8 @@ xencomm_add_offset(
             desc->address[i] += chunk_skip;
         }
         bytes -= chunk_skip;
+       
+       i++;
     }
     return handle;
 }
diff -r 25e6a17e82f0 -r d19deb173503 xen/arch/powerpc/usercopy.c
--- a/xen/arch/powerpc/usercopy.c       Fri Nov 10 14:53:00 2006 +0000
+++ b/xen/arch/powerpc/usercopy.c       Fri Nov 10 15:27:22 2006 +0000
@@ -249,6 +249,11 @@ int xencomm_add_offset(void *handle, uns
         unsigned int chunksz;
         unsigned int chunk_skip;
 
+        if (dest_paddr == XENCOMM_INVALID) {
+            i++;
+            continue;
+        }
+
         pgoffset = dest_paddr % PAGE_SIZE;
         chunksz = PAGE_SIZE - pgoffset;
 
@@ -260,6 +265,8 @@ int xencomm_add_offset(void *handle, uns
             desc->address[i] += chunk_skip;
         }
         bytes -= chunk_skip;
+
+       i++;
     }
     return 0;
 }

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