From 1b6ca5d03029a0f2d59572f59b31e0a0e614e312 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Sun, 28 Jun 2015 16:34:20 +0000 Subject: [PATCH] xen: Fix XEN_DOMCTL_getvcpuextstate Xen only writes into the provided buffer if the guest handle was not NULL. Signed-off-by: Andrew Cooper git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15367 --- coregrind/m_syswrap/syswrap-xen.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/coregrind/m_syswrap/syswrap-xen.c b/coregrind/m_syswrap/syswrap-xen.c index 6ce28e65cf..d5d4c28d09 100644 --- a/coregrind/m_syswrap/syswrap-xen.c +++ b/coregrind/m_syswrap/syswrap-xen.c @@ -1483,10 +1483,9 @@ POST(domctl){ case VKI_XEN_DOMCTL_getvcpuextstate: - __POST_XEN_DOMCTL_WRITE(getvcpuextstate, vcpuextstate, xfeature_mask); - __POST_XEN_DOMCTL_WRITE(getvcpuextstate, vcpuextstate, size); - POST_MEM_WRITE((Addr)domctl->u.vcpuextstate.buffer.p, - domctl->u.vcpuextstate.size); + if (domctl->u.vcpuextstate.buffer.p) + POST_MEM_WRITE((Addr)domctl->u.vcpuextstate.buffer.p, + domctl->u.vcpuextstate.size); break; case VKI_XEN_DOMCTL_shadow_op: -- 2.47.2