diff options
| author | Colin Ian King <colin.king@canonical.com> | 2021-06-11 15:50:24 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2021-06-18 15:19:50 +0200 |
| commit | 934ed4580c0a13a49ab7c4cbf94cd1958c0679ed (patch) | |
| tree | 7cbd355c09a4557ee6949e306eb45a506c03f1a2 /drivers/iommu/intel | |
| parent | iommu/vt-d: Fix linker error on 32-bit (diff) | |
| download | linux-934ed4580c0a13a49ab7c4cbf94cd1958c0679ed.tar.xz linux-934ed4580c0a13a49ab7c4cbf94cd1958c0679ed.zip | |
iommu/vt-d: Fix dereference of pointer info before it is null checked
The assignment of iommu from info->iommu occurs before info is null checked
hence leading to a potential null pointer dereference issue. Fix this by
assigning iommu and checking if iommu is null after null checking info.
Addresses-Coverity: ("Dereference before null check")
Fixes: 4c82b88696ac ("iommu/vt-d: Allocate/register iopf queue for sva devices")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20210611135024.32781-1-colin.king@canonical.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/intel')
| -rw-r--r-- | drivers/iommu/intel/iommu.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c index bd93c7ec879e..76a58b8ad6c3 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c @@ -5329,10 +5329,14 @@ static int intel_iommu_disable_auxd(struct device *dev) static int intel_iommu_enable_sva(struct device *dev) { struct device_domain_info *info = get_domain_info(dev); - struct intel_iommu *iommu = info->iommu; + struct intel_iommu *iommu; int ret; - if (!info || !iommu || dmar_disabled) + if (!info || dmar_disabled) + return -EINVAL; + + iommu = info->iommu; + if (!iommu) return -EINVAL; if (!(iommu->flags & VTD_FLAG_SVM_CAPABLE)) |