Skip to content

Commit 3222b6d

Browse files
hegdevasantjoergroedel
authored andcommitted
iommu/amd: Fix error path in amd_iommu_probe_device()
Currently, the error path of amd_iommu_probe_device() unconditionally references dev_data, which may not be initialized if an early failure occurs (like iommu_init_device() fails). Move the out_err label to ensure the function exits immediately on failure without accessing potentially uninitialized dev_data. Fixes: 19e5cc1 ("iommu/amd: Enable support for up to 2K interrupts per function") Cc: Rakuram Eswaran <rakuram.e96@gmail.com> Cc: Jörg Rödel <joro@8bytes.org> Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/202512191724.meqJENXe-lkp@intel.com/ Signed-off-by: Vasant Hegde <vasant.hegde@amd.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
1 parent 0f61b18 commit 3222b6d

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

drivers/iommu/amd/iommu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2450,8 +2450,6 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev)
24502450
goto out_err;
24512451
}
24522452

2453-
out_err:
2454-
24552453
iommu_completion_wait(iommu);
24562454

24572455
if (FEATURE_NUM_INT_REMAP_SUP_2K(amd_iommu_efr2))
@@ -2462,6 +2460,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev)
24622460
if (dev_is_pci(dev))
24632461
pci_prepare_ats(to_pci_dev(dev), PAGE_SHIFT);
24642462

2463+
out_err:
24652464
return iommu_dev;
24662465
}
24672466

0 commit comments

Comments
 (0)