From: Joerg Roedel Date: Tue, 2 Feb 2021 14:54:19 +0000 (+0100) Subject: iommu: Check dev->iommu in dev_iommu_priv_get() before dereferencing it X-Git-Tag: v5.10.17~207 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2bb221a16ac90a98c4fd2a6a4e0e096cba3bd45;p=platform%2Fkernel%2Flinux-rpi.git iommu: Check dev->iommu in dev_iommu_priv_get() before dereferencing it commit 4c9fb5d9140802db4db9f66c23887f43174e113c upstream. 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/include/linux/iommu.h b/include/linux/iommu.h index b95a6f8..9bbcfe3 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -614,7 +614,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)