From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Feb 2021 17:57:29 +0000 (-0800)
Subject: Merge tag 'iommu-fixes-v5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~1850
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97ba0c7413f83ab3b43a5ba05362ecc837fce518;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'iommu-fixes-v5.11-rc6' of git://git./linux/kernel/git/joro/iommu

Pull IOMMU fix from Joerg Roedel:
 "Fix a possible NULL-ptr dereference in dev_iommu_priv_get() which is
  too easy to accidentially trigger from IOMMU drivers.

  In the current case the AMD IOMMU driver triggered it on some machines
  in the IO-page-fault path, so fix it once and for all"

* tag 'iommu-fixes-v5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu: Check dev->iommu in dev_iommu_priv_get() before dereferencing it
---

97ba0c7413f83ab3b43a5ba05362ecc837fce518