[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/47] hcd-xhci: check & correct param before using i
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 35/47] hcd-xhci: check & correct param before using it |
Date: |
Thu, 10 Nov 2016 18:14:01 +0200 |
From: Cao jin <address@hidden>
usb_xhci_realize() corrects invalid values of property "intrs"
automatically, but the uncorrected value is passed to msi_init(),
which chokes on invalid values. Delay that until after the
correction.
Resources allocated by usb_xhci_init() are leaked when msi_init()
fails. Fix by calling it after msi_init().
CC: Gerd Hoffmann <address@hidden>
CC: Markus Armbruster <address@hidden>
CC: Marcel Apfelbaum <address@hidden>
CC: Michael S. Tsirkin <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Cao jin <address@hidden>
Acked-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/usb/hcd-xhci.c | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 4acf0c6..eb1dca5 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3627,25 +3627,6 @@ static void usb_xhci_realize(struct PCIDevice *dev,
Error **errp)
dev->config[PCI_CACHE_LINE_SIZE] = 0x10;
dev->config[0x60] = 0x30; /* release number */
- usb_xhci_init(xhci);
-
- if (xhci->msi != ON_OFF_AUTO_OFF) {
- ret = msi_init(dev, 0x70, xhci->numintrs, true, false, &err);
- /* Any error other than -ENOTSUP(board's MSI support is broken)
- * is a programming error */
- assert(!ret || ret == -ENOTSUP);
- if (ret && xhci->msi == ON_OFF_AUTO_ON) {
- /* Can't satisfy user's explicit msi=on request, fail */
- error_append_hint(&err, "You have to use msi=auto (default) or "
- "msi=off with this machine type.\n");
- error_propagate(errp, err);
- return;
- }
- assert(!err || xhci->msi == ON_OFF_AUTO_AUTO);
- /* With msi=auto, we fall back to MSI off silently */
- error_free(err);
- }
-
if (xhci->numintrs > MAXINTRS) {
xhci->numintrs = MAXINTRS;
}
@@ -3667,7 +3648,22 @@ static void usb_xhci_realize(struct PCIDevice *dev,
Error **errp)
xhci->max_pstreams_mask = 0;
}
- xhci->mfwrap_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, xhci_mfwrap_timer,
xhci);
+ if (xhci->msi != ON_OFF_AUTO_OFF) {
+ ret = msi_init(dev, 0x70, xhci->numintrs, true, false, &err);
+ /* Any error other than -ENOTSUP(board's MSI support is broken)
+ * is a programming error */
+ assert(!ret || ret == -ENOTSUP);
+ if (ret && xhci->msi == ON_OFF_AUTO_ON) {
+ /* Can't satisfy user's explicit msi=on request, fail */
+ error_append_hint(&err, "You have to use msi=auto (default) or "
+ "msi=off with this machine type.\n");
+ error_propagate(errp, err);
+ return;
+ }
+ assert(!err || xhci->msi == ON_OFF_AUTO_AUTO);
+ /* With msi=auto, we fall back to MSI off silently */
+ error_free(err);
+ }
memory_region_init(&xhci->mem, OBJECT(xhci), "xhci", LEN_REGS);
memory_region_init_io(&xhci->mem_cap, OBJECT(xhci), &xhci_cap_ops, xhci,
@@ -3697,6 +3693,9 @@ static void usb_xhci_realize(struct PCIDevice *dev, Error
**errp)
PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64,
&xhci->mem);
+ usb_xhci_init(xhci);
+ xhci->mfwrap_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, xhci_mfwrap_timer,
xhci);
+
if (pci_bus_is_express(dev->bus) ||
xhci_get_flag(xhci, XHCI_FLAG_FORCE_PCIE_ENDCAP)) {
ret = pcie_endpoint_cap_init(dev, 0xa0);
--
MST
- [Qemu-devel] [PULL 25/47] docs: improve the doc of Read FIT method, (continued)
- [Qemu-devel] [PULL 25/47] docs: improve the doc of Read FIT method, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 27/47] nvdimm acpi: cleanup nvdimm_build_fit, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 26/47] nvdimm acpi: rename nvdimm_plugged_device_list, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 28/47] nvdimm acpi: rename nvdimm_acpi_hotplug, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 29/47] nvdimm acpi: define DSM return codes, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 30/47] nvdimm acpi: fix two comments, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 31/47] nvdimm acpi: rename nvdimm_dsm_reserved_root, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 32/47] nvdimm acpi: use aml_name_decl to define named object, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 33/47] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 34/47] msix: Follow CODING_STYLE, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 35/47] hcd-xhci: check & correct param before using it,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 38/47] hcd-xhci: change behaviour of msix switch, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 37/47] megasas: change behaviour of msix switch, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 40/47] megasas: undo the overwrites of msi user configuration, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 36/47] pci: Convert msix_init() to Error and fix callers to check it, Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 39/47] megasas: remove unnecessary megasas_use_msix(), Michael S. Tsirkin, 2016/11/10
- [Qemu-devel] [PULL 42/47] vmxnet3: remove unnecessary internal msix flag, Michael S. Tsirkin, 2016/11/10