diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-05 16:42:27 +0100 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2006-10-05 16:42:27 +0100 |
| commit | 8ee614278c2d058881db620b1fa065566e6fcf50 (patch) | |
| tree | e240a7dac8c531858ba15c7f6d9936a059899863 | |
| parent | d9535802e3179138b60eabc9bba3ad36d23aad47 (diff) | |
| download | xen-8ee614278c2d058881db620b1fa065566e6fcf50.tar.gz xen-8ee614278c2d058881db620b1fa065566e6fcf50.tar.bz2 xen-8ee614278c2d058881db620b1fa065566e6fcf50.zip | |
[XEN] Fix memtype accessor domctls.
From: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Keir Fraser <keir@xensource.com>
| -rw-r--r-- | xen/arch/x86/platform_hypercall.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 1b886caab2..33be6746b3 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -58,12 +58,13 @@ long do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) op->u.add_memtype.nr_mfns, op->u.add_memtype.type, 1); - if ( ret > 0 ) + if ( ret >= 0 ) { op->u.add_memtype.handle = 0; op->u.add_memtype.reg = ret; - (void)copy_to_guest(u_xenpf_op, op, 1); - ret = 0; + ret = copy_to_guest(u_xenpf_op, op, 1) ? -EFAULT : 0; + if ( ret != 0 ) + mtrr_del_page(ret, 0, 0); } } break; @@ -75,7 +76,7 @@ long do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) && (int)op->u.del_memtype.reg >= 0) { ret = mtrr_del_page(op->u.del_memtype.reg, 0, 0); - if (ret > 0) + if ( ret > 0 ) ret = 0; } else @@ -96,8 +97,7 @@ long do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) op->u.read_memtype.mfn = mfn; op->u.read_memtype.nr_mfns = nr_mfns; op->u.read_memtype.type = type; - (void)copy_to_guest(u_xenpf_op, op, 1); - ret = 0; + ret = copy_to_guest(u_xenpf_op, op, 1) ? -EFAULT : 0; } } break; |