Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Eric Auger <eric.auger@redhat.com>
To:     eric.auger.pro@gmail.com, eric.auger@redhat.com, joro@8bytes.org,
        hch@lst.de, cai@lca.pw, iommu@lists.linux-foundation.org,
        linux-kernel@vger.kernel.org
Cc:     jsnitsel@redhat.com
Subject: [PATCH v4] iommu: fix KASAN use-after-free in iommu_insert_resv_region
Date:   Tue, 26 Nov 2019 18:54:13 +0100
Message-Id: <20191126175413.4350-1-eric.auger@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

In case the new region gets merged into another one, the nr
list node is freed. Checking its type while completing the
merge algorithm leads to a use-after-free. Use new->type
instead.

Fixes: 4dbd258ff63e ("iommu: Revisit iommu_insert_resv_region()
implementation")
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Reported-by: Qian Cai <cai@lca.pw>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Cc: Stable <stable@vger.kernel.org> #v5.3+

---

v3 -> v4:
- s/nr/new in the comment
- Added Jerry's R-b

v2 -> v3:
- directly use new->type

v1 -> v2:
- remove spurious new line
---
 drivers/iommu/iommu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index d658c7c6a2ab..dea1069334a4 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -312,8 +312,8 @@ int iommu_insert_resv_region(struct iommu_resv_region *=
new,
 =09list_for_each_entry_safe(iter, tmp, regions, list) {
 =09=09phys_addr_t top_end, iter_end =3D iter->start + iter->length - 1;
=20
-=09=09/* no merge needed on elements of different types than @nr */
-=09=09if (iter->type !=3D nr->type) {
+=09=09/* no merge needed on elements of different types than @new */
+=09=09if (iter->type !=3D new->type) {
 =09=09=09list_move_tail(&iter->list, &stack);
 =09=09=09continue;
 =09=09}
--=20
2.20.1