From: Lu Baolu <baolu.lu@linux.intel.com>
To: Dmitry Safonov <dima@arista.com>, linux-kernel@vger.kernel.org
Cc: David Woodhouse <dwmw2@infradead.org>,
Dmitry Safonov <0x7f454c46@gmail.com>,
iommu@lists.linux-foundation.org
Subject: Re: [PATCH 2/2] iommu/vt-d: Check if domain->pgd was allocated
Date: Fri, 19 Jul 2019 17:15:21 +0800 [thread overview]
Message-ID: <0748b24f-7c21-be93-59fa-88f62c3e8389@linux.intel.com> (raw)
In-Reply-To: <20190716213806.20456-2-dima@arista.com>
Hi,
On 7/17/19 5:38 AM, Dmitry Safonov wrote:
> There is a couple of places where on domain_init() failure domain_exit()
> is called. While currently domain_init() can fail only if
> alloc_pgtable_page() has failed.
>
> Make domain_exit() check if domain->pgd present, before calling
> domain_unmap(), as it theoretically should crash on clearing pte entries
> in dma_pte_clear_level().
>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Joerg Roedel <joro@8bytes.org>
> Cc: Lu Baolu <baolu.lu@linux.intel.com>
This looks good to me. Thank you!
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Best regards,
Baolu
> Cc: iommu@lists.linux-foundation.org
> Signed-off-by: Dmitry Safonov <dima@arista.com>
> ---
> drivers/iommu/intel-iommu.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index 6d1510284d21..698cc40355ef 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -1835,7 +1835,6 @@ static inline int guestwidth_to_adjustwidth(int gaw)
>
> static void domain_exit(struct dmar_domain *domain)
> {
> - struct page *freelist;
>
> /* Remove associated devices and clear attached or cached domains */
> domain_remove_dev_info(domain);
> @@ -1843,9 +1842,12 @@ static void domain_exit(struct dmar_domain *domain)
> /* destroy iovas */
> put_iova_domain(&domain->iovad);
>
> - freelist = domain_unmap(domain, 0, DOMAIN_MAX_PFN(domain->gaw));
> + if (domain->pgd) {
> + struct page *freelist;
>
> - dma_free_pagelist(freelist);
> + freelist = domain_unmap(domain, 0, DOMAIN_MAX_PFN(domain->gaw));
> + dma_free_pagelist(freelist);
> + }
>
> free_domain_mem(domain);
> }
>
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2019-07-19 9:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-16 21:38 [PATCH 1/2] iommu/vt-d: Don't queue_iova() if there is no flush queue Dmitry Safonov via iommu
2019-07-16 21:38 ` [PATCH 2/2] iommu/vt-d: Check if domain->pgd was allocated Dmitry Safonov via iommu
2019-07-19 9:15 ` Lu Baolu [this message]
2019-07-16 23:57 ` [PATCH 1/2] iommu/vt-d: Don't queue_iova() if there is no flush queue Sasha Levin
2019-07-19 9:26 ` Lu Baolu
2019-07-22 15:44 ` Joerg Roedel
2019-07-23 8:17 ` Joerg Roedel
2019-07-23 8:49 ` Dmitry Safonov via iommu
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=0748b24f-7c21-be93-59fa-88f62c3e8389@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=0x7f454c46@gmail.com \
--cc=dima@arista.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@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