All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: Auger Eric <eric.auger@redhat.com>
Cc: "Tian, Kevin" <kevin.tian@intel.com>,
	Raj Ashok <ashok.raj@intel.com>, Jonathan Corbet <corbet@lwn.net>,
	Jean-Philippe Brucker <jean-philippe@linaro.com>,
	Alex Williamson <alex.williamson@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Christoph Hellwig <hch@infradead.org>,
	iommu@lists.linux-foundation.org,
	David Woodhouse <dwmw2@infradead.org>
Subject: Re: [PATCH v7 7/7] iommu/vt-d: Check UAPI data processed by IOMMU core
Date: Mon, 31 Aug 2020 10:52:24 -0700	[thread overview]
Message-ID: <20200831105224.7a90ba34@jacob-builder> (raw)
In-Reply-To: <1b131401-a9a3-3641-99cc-430d9b51efa5@redhat.com>

On Thu, 13 Aug 2020 11:19:46 +0200
Auger Eric <eric.auger@redhat.com> wrote:

> Hi Jacob,
> 
> On 7/30/20 2:21 AM, Jacob Pan wrote:
> > IOMMU generic layer already does sanity checks UAPI data for version
> > match and argsz range under generic information.
> > Remove the redundant version check from VT-d driver and check for
> > vendor specific data size.
> > 
> > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>  
> 
> > ---
> >  drivers/iommu/intel/iommu.c | 3 +--
> >  drivers/iommu/intel/svm.c   | 7 +++++--
> >  2 files changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/iommu/intel/iommu.c
> > b/drivers/iommu/intel/iommu.c index 021f62078f52..7e03cca31a0e
> > 100644 --- a/drivers/iommu/intel/iommu.c
> > +++ b/drivers/iommu/intel/iommu.c
> > @@ -5391,8 +5391,7 @@ intel_iommu_sva_invalidate(struct
> > iommu_domain *domain, struct device *dev, int ret = 0;
> >  	u64 size = 0;
> >  
> > -	if (!inv_info || !dmar_domain ||
> > -	    inv_info->version !=
> > IOMMU_CACHE_INVALIDATE_INFO_VERSION_1)
> > +	if (!inv_info || !dmar_domain)
> >  		return -EINVAL;
> >  
> >  	if (!dev || !dev_is_pci(dev))
> > diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
> > index 713b3a218483..55ea11e9c0f5 100644
> > --- a/drivers/iommu/intel/svm.c
> > +++ b/drivers/iommu/intel/svm.c
> > @@ -240,8 +240,11 @@ int intel_svm_bind_gpasid(struct iommu_domain
> > *domain, struct device *dev, if (WARN_ON(!iommu) || !data)
> >  		return -EINVAL;
> >  
> > -	if (data->version != IOMMU_GPASID_BIND_VERSION_1 ||
> > -	    data->format != IOMMU_PASID_FORMAT_INTEL_VTD)
> > +	if (data->format != IOMMU_PASID_FORMAT_INTEL_VTD)
> > +		return -EINVAL;
> > +
> > +	/* IOMMU core ensures argsz is more than the start of the
> > union */
> > +	if (data->argsz < offsetofend(struct
> > iommu_gpasid_bind_data, vendor.vtd)) return -EINVAL;  
> Shouldn't you test the vendor flags here?
> intel_pasid_setup_bind_data() only checks valid ones but not ~mask.
> 
Yes, vendor flags should be tested to make sure there is no undefined
flags being used.

Thanks!

> Thanks
> 
> Eric
> >  
> >  	if (!dev_is_pci(dev))
> >   
> 

[Jacob Pan]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

WARNING: multiple messages have this Message-ID (diff)
From: Jacob Pan <jacob.jun.pan@linux.intel.com>
To: Auger Eric <eric.auger@redhat.com>
Cc: iommu@lists.linux-foundation.org,
	LKML <linux-kernel@vger.kernel.org>,
	Joerg Roedel <joro@8bytes.org>,
	Alex Williamson <alex.williamson@redhat.com>,
	Lu Baolu <baolu.lu@linux.intel.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Yi Liu <yi.l.liu@intel.com>, "Tian, Kevin" <kevin.tian@intel.com>,
	Raj Ashok <ashok.raj@intel.com>,
	Christoph Hellwig <hch@infradead.org>,
	Jean-Philippe Brucker <jean-philippe@linaro.com>,
	Jonathan Corbet <corbet@lwn.net>,
	jacob.jun.pan@linux.intel.com
Subject: Re: [PATCH v7 7/7] iommu/vt-d: Check UAPI data processed by IOMMU core
Date: Mon, 31 Aug 2020 10:52:24 -0700	[thread overview]
Message-ID: <20200831105224.7a90ba34@jacob-builder> (raw)
In-Reply-To: <1b131401-a9a3-3641-99cc-430d9b51efa5@redhat.com>

On Thu, 13 Aug 2020 11:19:46 +0200
Auger Eric <eric.auger@redhat.com> wrote:

> Hi Jacob,
> 
> On 7/30/20 2:21 AM, Jacob Pan wrote:
> > IOMMU generic layer already does sanity checks UAPI data for version
> > match and argsz range under generic information.
> > Remove the redundant version check from VT-d driver and check for
> > vendor specific data size.
> > 
> > Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>  
> 
> > ---
> >  drivers/iommu/intel/iommu.c | 3 +--
> >  drivers/iommu/intel/svm.c   | 7 +++++--
> >  2 files changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/iommu/intel/iommu.c
> > b/drivers/iommu/intel/iommu.c index 021f62078f52..7e03cca31a0e
> > 100644 --- a/drivers/iommu/intel/iommu.c
> > +++ b/drivers/iommu/intel/iommu.c
> > @@ -5391,8 +5391,7 @@ intel_iommu_sva_invalidate(struct
> > iommu_domain *domain, struct device *dev, int ret = 0;
> >  	u64 size = 0;
> >  
> > -	if (!inv_info || !dmar_domain ||
> > -	    inv_info->version !=
> > IOMMU_CACHE_INVALIDATE_INFO_VERSION_1)
> > +	if (!inv_info || !dmar_domain)
> >  		return -EINVAL;
> >  
> >  	if (!dev || !dev_is_pci(dev))
> > diff --git a/drivers/iommu/intel/svm.c b/drivers/iommu/intel/svm.c
> > index 713b3a218483..55ea11e9c0f5 100644
> > --- a/drivers/iommu/intel/svm.c
> > +++ b/drivers/iommu/intel/svm.c
> > @@ -240,8 +240,11 @@ int intel_svm_bind_gpasid(struct iommu_domain
> > *domain, struct device *dev, if (WARN_ON(!iommu) || !data)
> >  		return -EINVAL;
> >  
> > -	if (data->version != IOMMU_GPASID_BIND_VERSION_1 ||
> > -	    data->format != IOMMU_PASID_FORMAT_INTEL_VTD)
> > +	if (data->format != IOMMU_PASID_FORMAT_INTEL_VTD)
> > +		return -EINVAL;
> > +
> > +	/* IOMMU core ensures argsz is more than the start of the
> > union */
> > +	if (data->argsz < offsetofend(struct
> > iommu_gpasid_bind_data, vendor.vtd)) return -EINVAL;  
> Shouldn't you test the vendor flags here?
> intel_pasid_setup_bind_data() only checks valid ones but not ~mask.
> 
Yes, vendor flags should be tested to make sure there is no undefined
flags being used.

Thanks!

> Thanks
> 
> Eric
> >  
> >  	if (!dev_is_pci(dev))
> >   
> 

[Jacob Pan]

  reply	other threads:[~2020-08-31 17:45 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-30  0:21 [PATCH v7 0/7] IOMMU user API enhancement Jacob Pan
2020-07-30  0:21 ` Jacob Pan
2020-07-30  0:21 ` [PATCH v7 1/7] docs: IOMMU user API Jacob Pan
2020-07-30  0:21   ` Jacob Pan
2020-08-12 16:38   ` Auger Eric
2020-08-12 16:38     ` Auger Eric
2020-08-17 22:07     ` Jacob Pan
2020-08-17 22:07       ` Jacob Pan
2020-07-30  0:21 ` [PATCH v7 2/7] iommu/uapi: Add argsz for user filled data Jacob Pan
2020-07-30  0:21   ` Jacob Pan
2020-08-12 16:59   ` Auger Eric
2020-08-12 16:59     ` Auger Eric
2020-08-17 22:48     ` Jacob Pan
2020-08-17 22:48       ` Jacob Pan
2020-07-30  0:21 ` [PATCH v7 3/7] iommu/uapi: Introduce enum type for PASID data format Jacob Pan
2020-07-30  0:21   ` Jacob Pan
2020-08-13  9:29   ` Auger Eric
2020-08-13  9:29     ` Auger Eric
2020-07-30  0:21 ` [PATCH v7 4/7] iommu/uapi: Use named union for user data Jacob Pan
2020-07-30  0:21   ` Jacob Pan
2020-07-30  0:21 ` [PATCH v7 5/7] iommu/uapi: Rename uapi functions Jacob Pan
2020-07-30  0:21   ` Jacob Pan
2020-08-13  8:58   ` Auger Eric
2020-08-13  8:58     ` Auger Eric
2020-08-17 23:16     ` Jacob Pan
2020-08-17 23:16       ` Jacob Pan
2020-07-30  0:21 ` [PATCH v7 6/7] iommu/uapi: Handle data and argsz filled by users Jacob Pan
2020-07-30  0:21   ` Jacob Pan
2020-08-13  9:11   ` Auger Eric
2020-08-13  9:11     ` Auger Eric
2020-08-13  9:25     ` Liu, Yi L
2020-08-13  9:25       ` Liu, Yi L
2020-08-13  9:30       ` Auger Eric
2020-08-13  9:30         ` Auger Eric
2020-08-13  9:38         ` Liu, Yi L
2020-08-13  9:38           ` Liu, Yi L
2020-08-13 10:03           ` Auger Eric
2020-08-13 10:03             ` Auger Eric
2020-07-30  0:21 ` [PATCH v7 7/7] iommu/vt-d: Check UAPI data processed by IOMMU core Jacob Pan
2020-07-30  0:21   ` Jacob Pan
2020-08-13  9:19   ` Auger Eric
2020-08-13  9:19     ` Auger Eric
2020-08-31 17:52     ` Jacob Pan [this message]
2020-08-31 17:52       ` Jacob Pan

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=20200831105224.7a90ba34@jacob-builder \
    --to=jacob.jun.pan@linux.intel.com \
    --cc=alex.williamson@redhat.com \
    --cc=ashok.raj@intel.com \
    --cc=corbet@lwn.net \
    --cc=dwmw2@infradead.org \
    --cc=eric.auger@redhat.com \
    --cc=hch@infradead.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jean-philippe@linaro.com \
    --cc=kevin.tian@intel.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.