In 38b37ed82705 "x86/domctl: cleanup", XEN_DOMCTL_gettscinfo was
changed to use the standard copyback mechanism.
However the output TSC Info is a guerst handle, i.e. a pointer to the
location for the information, copyback just copies the unchanged
pointer back.
Switch back to fetching the details into a local struct and explicitly
copying it back.
This caused test failures in the Cambridge instance of osstest, but
not for some reason in the production instance.
Signed-off-by: Ian Campbell <ian.campb...@citrix.com>
Reviewed-by: Andrew Cooper <andrew.coop...@citrix.com>
---
v2: Copy back outside domain pause.
---
xen/arch/x86/domctl.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index b6df23a..6d3fe91 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -856,13 +856,16 @@ long arch_do_domctl(
ret = -EINVAL;
else
{
+ xen_guest_tsc_info_t info = { 0 };
+
domain_pause(d);
- tsc_get_info(d, &domctl->u.tsc_info.info.tsc_mode,
- &domctl->u.tsc_info.info.elapsed_nsec,
- &domctl->u.tsc_info.info.gtsc_khz,
- &domctl->u.tsc_info.info.incarnation);
+ tsc_get_info(d, &info.tsc_mode,
+ &info.elapsed_nsec,
+ &info.gtsc_khz,
+ &info.incarnation);
domain_unpause(d);
- copyback = 1;
+ if ( copy_to_guest(domctl->u.tsc_info.out_info, &info, 1) )
+ ret = -EFAULT;
}
break;
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
