evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xen/pci: Allocate memory for physdev_pci_device_add's optarr

Browse source 
physdev_pci_device_add's optarr[] is a zero-sized array and therefore
reference to add.optarr[0] is accessing memory that does not belong to
the 'add' variable.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
This commit is contained in:
Boris Ostrovsky 2014-08-04 18:17:23 -04:00 • committed by David Vrabel
parent 1ea644c8f9
commit 486edb2495
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/xen/pci.c
View file

@ -41,24 +41,29 @@ static int xen_add_device(struct device *dev)
#endif #endif
if (pci_seg_supported) { if (pci_seg_supported) {
struct physdev_pci_device_add add = { struct {
.seg = pci_domain_nr(pci_dev->bus), struct physdev_pci_device_add add;
.bus = pci_dev->bus->number, uint32_t pxm;
.devfn = pci_dev->devfn } add_ext = {
.add.seg = pci_domain_nr(pci_dev->bus),
.add.bus = pci_dev->bus->number,
.add.devfn = pci_dev->devfn
}; };
struct physdev_pci_device_add *add = &add_ext.add;
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
acpi_handle handle; acpi_handle handle;
#endif #endif
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
if (pci_dev->is_virtfn) { if (pci_dev->is_virtfn) {
add.flags = XEN_PCI_DEV_VIRTFN; add->flags = XEN_PCI_DEV_VIRTFN;
add.physfn.bus = physfn->bus->number; add->physfn.bus = physfn->bus->number;
add.physfn.devfn = physfn->devfn; add->physfn.devfn = physfn->devfn;
} else } else
#endif #endif
if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn)) if (pci_ari_enabled(pci_dev->bus) && PCI_SLOT(pci_dev->devfn))
add.flags = XEN_PCI_DEV_EXTFN; add->flags = XEN_PCI_DEV_EXTFN;
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
handle = ACPI_HANDLE(&pci_dev->dev); handle = ACPI_HANDLE(&pci_dev->dev);
@ -77,8 +82,8 @@ static int xen_add_device(struct device *dev)
status = acpi_evaluate_integer(handle, "_PXM", status = acpi_evaluate_integer(handle, "_PXM",
NULL, &pxm); NULL, &pxm);
if (ACPI_SUCCESS(status)) { if (ACPI_SUCCESS(status)) {
add.optarr[0] = pxm; add->optarr[0] = pxm;
add.flags |= XEN_PCI_DEV_PXM; add->flags |= XEN_PCI_DEV_PXM;
break; break;
} }
status = acpi_get_parent(handle, &handle); status = acpi_get_parent(handle, &handle);
@ -86,7 +91,7 @@ static int xen_add_device(struct device *dev)
} }
#endif /* CONFIG_ACPI */ #endif /* CONFIG_ACPI */
r = HYPERVISOR_physdev_op(PHYSDEVOP_pci_device_add, &add); r = HYPERVISOR_physdev_op(PHYSDEVOP_pci_device_add, add);
if (r != -ENOSYS) if (r != -ENOSYS)
return r; return r;
pci_seg_supported = false; pci_seg_supported = false;