From: Alex Williamson <alex.williamson@redhat.com>
To: dwmw2@infradead.org, iommu@lists.linux-foundation.org
Cc: alex.williamson@redhat.com, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, ddutile@redhat.com, chrisw@redhat.com
Subject: [PATCH v2 2/2] intel-iommu: Fix get_domain_for_dev() error path
Date: Wed, 16 Feb 2011 13:40:08 -0700 [thread overview]
Message-ID: <20110216204005.2979.51224.stgit@s20.home> (raw)
In-Reply-To: <20110216203204.2979.13203.stgit@s20.home>
If we run out of domain_ids and fail iommu_attach_domain(), we
fall into domain_exit() without having setup enough of the
domain structure for this to do anything useful. In fact, it
typically runs off into the weeds walking the bogus domain->devices
list. Just free the domain.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
drivers/pci/intel-iommu.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index b670b06..b0343d1 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1835,7 +1835,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
ret = iommu_attach_domain(domain, iommu);
if (ret) {
- domain_exit(domain);
+ free_domain_mem(domain);
goto error;
}
next prev parent reply other threads:[~2011-02-16 20:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-16 20:39 [PATCH v2 0/2] intel-iommu: Fix domain_ids exhaustion Alex Williamson
2011-02-16 20:39 ` [PATCH v2 1/2] intel-iommu: Unlink domain from iommu Alex Williamson
2011-02-16 20:40 ` Alex Williamson [this message]
2011-02-17 20:13 ` [PATCH v2 0/2] intel-iommu: Fix domain_ids exhaustion Don Dutile
2011-02-18 0:38 ` Henrique de Moraes Holschuh
2011-02-23 19:32 ` Alex Williamson
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=20110216204005.2979.51224.stgit@s20.home \
--to=alex.williamson@redhat.com \
--cc=chrisw@redhat.com \
--cc=ddutile@redhat.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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