From: "Jan Beulich" Subject: [PATCH,RFC 1/17] public header adjustments Date: Wed, 04 Oct 2006 17:27:01 +0200 Message-ID: <4523EEE5.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Index: 2006-10-04/xen/arch/x86/domain.c =================================================================== --- 2006-10-04.orig/xen/arch/x86/domain.c 2006-09-21 13:26:07.000000000 +0200 +++ 2006-10-04/xen/arch/x86/domain.c 2006-10-04 09:27:29.000000000 +0200 @@ -386,15 +386,15 @@ arch_do_vcpu_op( if ( copy_from_guest(&area, arg, 1) ) break; - if ( !access_ok(area.addr.v, sizeof(*area.addr.v)) ) + if ( (unsigned long)area.addr.h.p != area.addr.p || + !guest_handle_okay(area.addr.h, 1) ) break; rc = 0; - v->runstate_guest = area.addr.v; + v->runstate_guest = area.addr.h; if ( v == current ) - __copy_to_user(v->runstate_guest, &v->runstate, - sizeof(v->runstate)); + __copy_to_guest(area.addr.h, &v->runstate, 1); break; } @@ -749,9 +749,8 @@ void context_switch(struct vcpu *prev, s context_saved(prev); /* Update per-VCPU guest runstate shared memory area (if registered). */ - if ( next->runstate_guest != NULL ) - __copy_to_user(next->runstate_guest, &next->runstate, - sizeof(next->runstate)); + if ( !guest_handle_is_null(next->runstate_guest) ) + __copy_to_guest(next->runstate_guest, &next->runstate, 1); schedule_tail(next); BUG(); Index: 2006-10-04/xen/arch/x86/mm.c =================================================================== --- 2006-10-04.orig/xen/arch/x86/mm.c 2006-10-04 08:49:30.000000000 +0200 +++ 2006-10-04/xen/arch/x86/mm.c 2006-10-04 09:27:53.000000000 +0200 @@ -2072,7 +2072,7 @@ int do_mmuext_op( { unsigned long vmask; cpumask_t pmask; - if ( unlikely(get_user(vmask, (unsigned long *)op.arg2.vcpumask)) ) + if ( unlikely(copy_from_guest(&vmask, op.arg2.vcpumask, 1)) ) { okay = 0; break; Index: 2006-10-04/xen/arch/x86/physdev.c =================================================================== --- 2006-10-04.orig/xen/arch/x86/physdev.c 2006-08-31 15:26:11.000000000 +0200 +++ 2006-10-04/xen/arch/x86/physdev.c 2006-09-21 11:09:00.000000000 +0200 @@ -125,7 +125,7 @@ long do_physdev_op(int cmd, XEN_GUEST_HA if ( copy_from_guest(&set_iobitmap, arg, 1) != 0 ) break; ret = -EINVAL; - if ( !access_ok(set_iobitmap.bitmap, IOBMP_BYTES) || + if ( !guest_handle_okay(set_iobitmap.bitmap, IOBMP_BYTES) || (set_iobitmap.nr_ports > 65536) ) break; ret = 0; Index: 2006-10-04/xen/arch/x86/traps.c =================================================================== --- 2006-10-04.orig/xen/arch/x86/traps.c 2006-09-20 15:53:06.000000000 +0200 +++ 2006-10-04/xen/arch/x86/traps.c 2006-10-04 09:28:00.000000000 +0200 @@ -971,7 +971,6 @@ static inline int guest_io_okay( unsigned int port, unsigned int bytes, struct vcpu *v, struct cpu_user_regs *regs) { - u16 x; #if defined(__x86_64__) /* If in user mode, switch to kernel mode just to read I/O bitmap. */ int user_mode = !(v->arch.flags & TF_kernel_mode); @@ -986,10 +985,17 @@ static inline int guest_io_okay( if ( v->arch.iobmp_limit > (port + bytes) ) { + union { uint8_t bytes[2]; uint16_t mask; } x; + TOGGLE_MODE(); - __get_user(x, (u16 *)(v->arch.iobmp+(port>>3))); + switch ( __copy_from_guest_offset(&x.bytes[0], v->arch.iobmp, port>>3, 2) ) + { + default: x.bytes[0] = ~0; + case 1: x.bytes[1] = ~0; + case 0: break; + } TOGGLE_MODE(); - if ( (x & (((1<