44 lines
1.6 KiB
Plaintext
44 lines
1.6 KiB
Plaintext
$NetBSD: patch-CVE-2013-1952,v 1.1 2013/05/03 16:48:38 drochner Exp $
|
|
|
|
see http://lists.xen.org/archives/html/xen-announce/2013-05/msg00001.html
|
|
|
|
--- xen/drivers/passthrough/vtd/intremap.c.orig 2013-04-23 16:44:20.000000000 +0000
|
|
+++ xen/drivers/passthrough/vtd/intremap.c
|
|
@@ -477,16 +477,15 @@ static void set_msi_source_id(struct pci
|
|
type = pdev_type(bus, devfn);
|
|
switch ( type )
|
|
{
|
|
+ case DEV_TYPE_PCIe_ENDPOINT:
|
|
case DEV_TYPE_PCIe_BRIDGE:
|
|
case DEV_TYPE_PCIe2PCI_BRIDGE:
|
|
- case DEV_TYPE_LEGACY_PCI_BRIDGE:
|
|
- break;
|
|
-
|
|
- case DEV_TYPE_PCIe_ENDPOINT:
|
|
set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_ALL_16, PCI_BDF2(bus, devfn));
|
|
break;
|
|
|
|
case DEV_TYPE_PCI:
|
|
+ case DEV_TYPE_LEGACY_PCI_BRIDGE:
|
|
+ /* case DEV_TYPE_PCI2PCIe_BRIDGE: */
|
|
ret = find_upstream_bridge(&bus, &devfn, &secbus);
|
|
if ( ret == 0 ) /* integrated PCI device */
|
|
{
|
|
@@ -498,10 +497,15 @@ static void set_msi_source_id(struct pci
|
|
if ( pdev_type(bus, devfn) == DEV_TYPE_PCIe2PCI_BRIDGE )
|
|
set_ire_sid(ire, SVT_VERIFY_BUS, SQ_ALL_16,
|
|
(bus << 8) | pdev->bus);
|
|
- else if ( pdev_type(bus, devfn) == DEV_TYPE_LEGACY_PCI_BRIDGE )
|
|
+ else
|
|
set_ire_sid(ire, SVT_VERIFY_SID_SQ, SQ_ALL_16,
|
|
PCI_BDF2(bus, devfn));
|
|
}
|
|
+ else
|
|
+ dprintk(XENLOG_WARNING VTDPREFIX,
|
|
+ "d%d: no upstream bridge for %02x:%02x.%u\n",
|
|
+ pdev->domain->domain_id,
|
|
+ bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
|
|
break;
|
|
|
|
default:
|