From: Laszlo Ersek Date: Tue, 22 Jul 2014 15:26:41 +0000 (+0200) Subject: vmstate_xhci_event: fix unterminated field list X-Git-Tag: qemu-xen-4.4.3-rc1~26 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=97082344dd7916998571c93c4f7f994471f96c3d;p=qemu-upstream-4.4-testing.git vmstate_xhci_event: fix unterminated field list "vmstate_xhci_event" was introduced in commit 37352df3 ("xhci: add live migration support"), and first released in v1.6.0. The field list in this VMSD is not terminated with the VMSTATE_END_OF_LIST() macro. During normal use (ie. migration), the issue is practically invisible, because the "vmstate_xhci_event" object (with the unterminated field list) is only ever referenced -- via "vmstate_xhci_intr" -- if xhci_er_full() returns true, for the "ev_buffer" test. Since that field_exists() check (apparently) almost always returns false, we almost never traverse "vmstate_xhci_event" during migration, which hides the bug. However, Amit's vmstate checker forces recursion into this VMSD as well, and the lack of VMSTATE_END_OF_LIST() breaks the field list terminator check (field->name != NULL) in dump_vmstate_vmsd(). The result is undefined behavior, which in my case translates to infinite recursion (because the loop happens to overflow into "vmstate_xhci_intr", which then links back to "vmstate_xhci_event"). Add the missing terminator. Signed-off-by: Laszlo Ersek Reviewed-by: Amit Shah Reviewed-by: Paolo Bonzini Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell --- diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 8010a6d5e..4dccfbab4 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3538,6 +3538,7 @@ static const VMStateDescription vmstate_xhci_event = { VMSTATE_UINT32(flags, XHCIEvent), VMSTATE_UINT8(slotid, XHCIEvent), VMSTATE_UINT8(epid, XHCIEvent), + VMSTATE_END_OF_LIST() } };