Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753535Ab1DUODS (ORCPT ); Thu, 21 Apr 2011 10:03:18 -0400 Received: from sous-sol.org ([216.99.217.87]:58894 "EHLO sequoia.sous-sol.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750915Ab1DUODR (ORCPT ); Thu, 21 Apr 2011 10:03:17 -0400 Date: Thu, 21 Apr 2011 07:02:16 -0700 From: Chris Wright To: Jan Kiszka Cc: Chris Wright , David Woodhouse , Sheng Yang , David Woodhouse , iommu@lists.linux-foundation.org, Marcelo Tosatti , Linux Kernel Mailing List , kvm , Avi Kivity Subject: Re: [PATCH v2] intel-iommu: Fix use after release during device attach Message-ID: <20110421140216.GH1821@sequoia.sous-sol.org> References: <4CCFB84F.6050102@web.de> <201011021531.22886.sheng@linux.intel.com> <4CDFA96D.1060301@web.de> <4D01E677.5070702@siemens.com> <20101210184402.GE4040@sequoia.sous-sol.org> <4D22F9A4.3050807@web.de> <4DB023C7.5070007@siemens.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4DB023C7.5070007@siemens.com> User-Agent: Mutt/1.5.20 (2009-08-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2925 Lines: 94 * Jan Kiszka (jan.kiszka@siemens.com) wrote: > On 2011-01-04 11:42, Jan Kiszka wrote: > > Am 10.12.2010 19:44, Chris Wright wrote: > >> * Jan Kiszka (jan.kiszka@siemens.com) wrote: > >>>>>> --- a/drivers/pci/intel-iommu.c > >>>>>> +++ b/drivers/pci/intel-iommu.c > >>>>>> @@ -3627,9 +3627,9 @@ static int intel_iommu_attach_device(struct > >>>>>> iommu_domain *domain, > >>>>>> > >>>>>> pte = dmar_domain->pgd; > >>>>>> if (dma_pte_present(pte)) { > >>>>>> - free_pgtable_page(dmar_domain->pgd); > >>>>>> dmar_domain->pgd = (struct dma_pte *) > >>>>>> phys_to_virt(dma_pte_addr(pte)); > >> > >> While here, might as well remove the unnecessary cast. > >> > >>>>>> + free_pgtable_page(pte); > >>>>>> } > >>>>>> dmar_domain->agaw--; > >>>>>> } > >>>>> > >>>>> Reviewed-by: Sheng Yang > >> > >> Acked-by: Chris Wright > >> > >>>>> CC iommu mailing list and David. > >>>> > >>>> Ping... > >>>> > >>>> I think this fix also qualifies for stable (.35 and .36). > >>>> > >>> > >>> Still not merged? > >> > >> David, do you plan to pick this one up? > >> > >> thanks, > >> -chris > > > > Hmm, still no reaction. Trying David's Intel address now... > > > > Jan > > > > Walking through my old queues, I came across this one again. > > Given the still lacking reaction from the official maintainer, I'm a > bit confused about the state of intel-iommu. Is it unmaintained? Should > this bug fix better be routed through the KVM tree as its only in-tree > user? Please enlighten me. > > Note that the patch became stable material for 35..38 in the meantime, > and it should go into 39 before release as well. > > Thanks, > Jan > > -------8<-------- > > Obtain the new pgd pointer before releasing the page containing this > value. Remove unneeded cast at this chance as well. > > Signed-off-by: Jan Kiszka Acked-by: Chris Wright > --- > drivers/pci/intel-iommu.c | 5 ++--- > 1 files changed, 2 insertions(+), 3 deletions(-) > > v1->v2: Clean up cast as suggested by Chris. > > diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c > index 505c1c7..b3e5c43 100644 > --- a/drivers/pci/intel-iommu.c > +++ b/drivers/pci/intel-iommu.c > @@ -3607,9 +3607,8 @@ static int intel_iommu_attach_device(struct iommu_domain *domain, > > pte = dmar_domain->pgd; > if (dma_pte_present(pte)) { > - free_pgtable_page(dmar_domain->pgd); > - dmar_domain->pgd = (struct dma_pte *) > - phys_to_virt(dma_pte_addr(pte)); > + dmar_domain->pgd = phys_to_virt(dma_pte_addr(pte)); > + free_pgtable_page(pte); > } > dmar_domain->agaw--; > } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/