Linux IOMMU Development
 help / color / mirror / Atom feed
From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: "Pranjal Shrivastava" <praan@google.com>,
	"Guanghui Feng" <guanghuifeng@linux.alibaba.com>,
	"Michał Grzelak" <michal.grzelak@intel.com>,
	"Michael Bommarito" <michael.bommarito@gmail.com>,
	iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] iommu/vt-d: Fix Use-After-Free in probe error path
Date: Wed,  3 Jun 2026 07:34:25 +0800	[thread overview]
Message-ID: <20260602233426.357499-7-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20260602233426.357499-1-baolu.lu@linux.intel.com>

From: Pranjal Shrivastava <praan@google.com>

When intel_iommu_probe_device() fails after the info structure has
been linked to the device via dev_iommu_priv_set(), the error path
calls kfree(info) but does not clear the pointer in the device
structure.

This results in a Use-After-Free regression if the pointer is accessed
by a subsequent IOMMU core call or a re-probe.

Fix this by ensuring dev_iommu_priv_set(dev, NULL) is called before
freeing the info structure in the error path.

Fixes: eda1a94caf6b ("iommu: Mark dev_iommu_priv_set() with a lockdep")
Reported-by: sashiko-bot@kernel.org
Closes: https://lore.kernel.org/all/20260525205628.CD4431F000E9@smtp.kernel.org/
Signed-off-by: Pranjal Shrivastava <praan@google.com>
Link: https://lore.kernel.org/r/20260531170254.60493-3-praan@google.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/iommu/intel/iommu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 849d06dfe1ae..ed6d3a0203f5 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -3320,6 +3320,7 @@ static struct iommu_device *intel_iommu_probe_device(struct device *dev)
 clear_rbtree:
 	device_rbtree_remove(info);
 free:
+	dev_iommu_priv_set(dev, NULL);
 	kfree(info);
 
 	return ERR_PTR(ret);
-- 
2.43.0


  parent reply	other threads:[~2026-06-02 23:37 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-02 23:34 [PATCH 0/6] [PULL REQUEST] Intel IOMMU updates for v7.2 Lu Baolu
2026-06-02 23:34 ` [PATCH 1/6] iommu/vt-d: Avoid WARNING in sva unbind path Lu Baolu
2026-06-02 23:34 ` [PATCH 2/6] iommu/vt-d: Clear Present bit before tearing down scalable-mode context entry Lu Baolu
2026-06-02 23:34 ` [PATCH 3/6] iommu/vt-d: Remove typo from pasid_pte_config_nested() Lu Baolu
2026-06-02 23:34 ` [PATCH 4/6] iommu/vt-d: Improve IOMMU fault information Lu Baolu
2026-06-02 23:34 ` [PATCH 5/6] iommu/vt-d: Fix RB-tree corruption in probe error path Lu Baolu
2026-06-02 23:34 ` Lu Baolu [this message]
2026-06-04  3:44 ` [PATCH 0/6] [PULL REQUEST] Intel IOMMU updates for v7.2 Baolu Lu
2026-06-04  5:27   ` Pranjal Shrivastava

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260602233426.357499-7-baolu.lu@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=guanghuifeng@linux.alibaba.com \
    --cc=iommu@lists.linux.dev \
    --cc=joro@8bytes.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=michael.bommarito@gmail.com \
    --cc=michal.grzelak@intel.com \
    --cc=praan@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox