[Xen-changelog] [xen-unstable] 32-on-64: Fix is_compat_arg_xlat_range().

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1213361293 -3600
# Node ID 08fb9a4489f7b076e6177de7fc9dc746855a39a6
# Parent  12ae02c09d1e9f0cd7153f256618dcc544420d54
32-on-64: Fix is_compat_arg_xlat_range().
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 xen/include/asm-x86/x86_64/uaccess.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r 12ae02c09d1e -r 08fb9a4489f7 xen/include/asm-x86/x86_64/uaccess.h
--- a/xen/include/asm-x86/x86_64/uaccess.h      Fri Jun 13 13:47:28 2008 +0100
+++ b/xen/include/asm-x86/x86_64/uaccess.h      Fri Jun 13 13:48:13 2008 +0100
@@ -7,7 +7,8 @@ DECLARE_PER_CPU(char, compat_arg_xlat[CO
 #define is_compat_arg_xlat_range(addr, size) ({                               \
     unsigned long __off;                                                      \
     __off = (unsigned long)(addr) - (unsigned long)COMPAT_ARG_XLAT_VIRT_BASE; \
-    (__off | (__off + (unsigned long)(size))) <= PAGE_SIZE;                   \
+    (__off <= COMPAT_ARG_XLAT_SIZE) &&                                        \
+    ((__off + (unsigned long)(size)) <= COMPAT_ARG_XLAT_SIZE);                \
 })
 
 /*

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