diff options
| author | Joerg Roedel <jroedel@suse.de> | 2021-02-02 17:54:19 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2021-02-02 17:57:23 +0300 |
| commit | 4c9fb5d9140802db4db9f66c23887f43174e113c (patch) | |
| tree | 5120519342e2502df40889c08be37d997d114ead | |
| parent | 1048ba83fb1c00cd24172e23e8263972f6b5d9ac (diff) | |
| download | linux-4c9fb5d9140802db4db9f66c23887f43174e113c.tar.xz | |
iommu: Check dev->iommu in dev_iommu_priv_get() before dereferencing it
The dev_iommu_priv_get() needs a similar check to
dev_iommu_fwspec_get() to make sure no NULL-ptr is dereferenced.
Fixes: 05a0542b456e1 ("iommu/amd: Store dev_data as device iommu private data")
Cc: stable@vger.kernel.org # v5.8+
Link: https://lore.kernel.org/r/20210202145419.29143-1-joro@8bytes.org
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=211241
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | include/linux/iommu.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index b3f0e2018c62..efa96263b81b 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -616,7 +616,10 @@ static inline void dev_iommu_fwspec_set(struct device *dev, static inline void *dev_iommu_priv_get(struct device *dev) { - return dev->iommu->priv; + if (dev->iommu) + return dev->iommu->priv; + else + return NULL; } static inline void dev_iommu_priv_set(struct device *dev, void *priv) |