mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 10:11:27 +01:00
IOMMU/x86: the bus-to-bridge lock needs to be acquired IRQ-safe
The function's use from set_msi_source_id() is guaranteed to be in an IRQs-off region. While the invocation of that function could be moved ahead in msi_msg_to_remap_entry() (doesn't need to be in the IOMMU- intremap-locked region), the call tree from map_domain_pirq() holds an IRQ descriptor lock. Hence all use sites of the lock need become IRQ- safe ones. In find_upstream_bridge() do a tiny bit of tidying in adjacent code: Change a variable's type to unsigned and merge a redundant assignment into another variable's initializer. This is XSA-467 / CVE-2025-1713. Fixes:476bbccc81("VT-d: fix MSI source-id of interrupt remapping") Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Juergen Gross <jgross@suse.com> Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> (cherry picked from commit39bc6af3ba)
This commit is contained in:
1 parent
93302bb888
commit
f2c5b4b1aa
1 file changed
+11
-9
@@ -351,20 +351,21 @@ static struct pci_dev *alloc_pdev(struct pci_seg *pseg, u8 bus, u8 devfn)
|
||||
switch ( pdev->type = pdev_type(pseg->nr, bus, devfn) )
|
||||
{
|
||||
unsigned int cap, sec_bus, sub_bus;
|
||||
unsigned long flags;
|
||||
|
||||
case DEV_TYPE_PCIe2PCI_BRIDGE:
|
||||
case DEV_TYPE_LEGACY_PCI_BRIDGE:
|
||||
sec_bus = pci_conf_read8(pdev->sbdf, PCI_SECONDARY_BUS);
|
||||
sub_bus = pci_conf_read8(pdev->sbdf, PCI_SUBORDINATE_BUS);
|
||||
|
||||
spin_lock(&pseg->bus2bridge_lock);
|
||||
spin_lock_irqsave(&pseg->bus2bridge_lock, flags);
|
||||
for ( ; sec_bus <= sub_bus; sec_bus++ )
|
||||
{
|
||||
pseg->bus2bridge[sec_bus].map = 1;
|
||||
pseg->bus2bridge[sec_bus].bus = bus;
|
||||
pseg->bus2bridge[sec_bus].devfn = devfn;
|
||||
}
|
||||
spin_unlock(&pseg->bus2bridge_lock);
|
||||
spin_unlock_irqrestore(&pseg->bus2bridge_lock, flags);
|
||||
break;
|
||||
|
||||
case DEV_TYPE_PCIe_ENDPOINT:
|
||||
@@ -434,16 +435,17 @@ static void free_pdev(struct pci_seg *pseg, struct pci_dev *pdev)
|
||||
switch ( pdev->type )
|
||||
{
|
||||
unsigned int sec_bus, sub_bus;
|
||||
unsigned long flags;
|
||||
|
||||
case DEV_TYPE_PCIe2PCI_BRIDGE:
|
||||
case DEV_TYPE_LEGACY_PCI_BRIDGE:
|
||||
sec_bus = pci_conf_read8(pdev->sbdf, PCI_SECONDARY_BUS);
|
||||
sub_bus = pci_conf_read8(pdev->sbdf, PCI_SUBORDINATE_BUS);
|
||||
|
||||
spin_lock(&pseg->bus2bridge_lock);
|
||||
spin_lock_irqsave(&pseg->bus2bridge_lock, flags);
|
||||
for ( ; sec_bus <= sub_bus; sec_bus++ )
|
||||
pseg->bus2bridge[sec_bus] = pseg->bus2bridge[pdev->bus];
|
||||
spin_unlock(&pseg->bus2bridge_lock);
|
||||
spin_unlock_irqrestore(&pseg->bus2bridge_lock, flags);
|
||||
break;
|
||||
|
||||
default:
|
||||
@@ -1067,8 +1069,9 @@ enum pdev_type pdev_type(u16 seg, u8 bus, u8 devfn)
|
||||
int find_upstream_bridge(u16 seg, u8 *bus, u8 *devfn, u8 *secbus)
|
||||
{
|
||||
struct pci_seg *pseg = get_pseg(seg);
|
||||
int ret = 0;
|
||||
int cnt = 0;
|
||||
int ret = 1;
|
||||
unsigned long flags;
|
||||
unsigned int cnt = 0;
|
||||
|
||||
if ( *bus == 0 )
|
||||
return 0;
|
||||
@@ -1079,8 +1082,7 @@ int find_upstream_bridge(u16 seg, u8 *bus, u8 *devfn, u8 *secbus)
|
||||
if ( !pseg->bus2bridge[*bus].map )
|
||||
return 0;
|
||||
|
||||
ret = 1;
|
||||
spin_lock(&pseg->bus2bridge_lock);
|
||||
spin_lock_irqsave(&pseg->bus2bridge_lock, flags);
|
||||
while ( pseg->bus2bridge[*bus].map )
|
||||
{
|
||||
*secbus = *bus;
|
||||
@@ -1094,7 +1096,7 @@ int find_upstream_bridge(u16 seg, u8 *bus, u8 *devfn, u8 *secbus)
|
||||
}
|
||||
|
||||
out:
|
||||
spin_unlock(&pseg->bus2bridge_lock);
|
||||
spin_unlock_irqrestore(&pseg->bus2bridge_lock, flags);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||