UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/vt-d: Check UAPI data processed by IOMMU core 

IOMMU generic layer already does sanity checks on UAPI data for version
match and argsz range based on generic information.

This patch adjusts the following data checking responsibilities:
- removes the redundant version check from VT-d driver
- removes the check for vendor specific data size
- adds check for the use of reserved/undefined flags

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Link: https://lore.kernel.org/r/1601051567-54787-7-git-send-email-jacob.jun.pan@linux.intel.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Jacob Pan 2020-09-25 09:32:47 -07:00 committed by Joerg Roedel
parent d90573812e
commit 6278eecba3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/iommu/intel/iommu.c
View File

@ -5398,8 +5398,7 @@ intel_iommu_sva_invalidate(struct iommu_domain *domain, struct device *dev,
int ret = 0; int ret = 0;
u64 size = 0; u64 size = 0;
if (!inv_info || !dmar_domain || if (!inv_info || !dmar_domain)
inv_info->version != IOMMU_CACHE_INVALIDATE_INFO_VERSION_1)
return -EINVAL; return -EINVAL;
if (!dev || !dev_is_pci(dev)) if (!dev || !dev_is_pci(dev))

11
drivers/iommu/intel/svm.c
View File

@ -284,8 +284,15 @@ int intel_svm_bind_gpasid(struct iommu_domain *domain, struct device *dev,
if (WARN_ON(!iommu) || !data) if (WARN_ON(!iommu) || !data)
return -EINVAL; return -EINVAL;
if (data->version != IOMMU_GPASID_BIND_VERSION_1 || if (data->format != IOMMU_PASID_FORMAT_INTEL_VTD)
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;
/* Make sure no undefined flags are used in vendor data */
if (data->vendor.vtd.flags & ~(IOMMU_SVA_VTD_GPASID_LAST - 1))
return -EINVAL; return -EINVAL;
if (!dev_is_pci(dev)) if (!dev_is_pci(dev))

1
include/uapi/linux/iommu.h
View File

@ -288,6 +288,7 @@ struct iommu_gpasid_bind_data_vtd {
#define IOMMU_SVA_VTD_GPASID_PWT (1 << 3) /* page-level write through */ #define IOMMU_SVA_VTD_GPASID_PWT (1 << 3) /* page-level write through */
#define IOMMU_SVA_VTD_GPASID_EMTE (1 << 4) /* extended mem type enable */ #define IOMMU_SVA_VTD_GPASID_EMTE (1 << 4) /* extended mem type enable */
#define IOMMU_SVA_VTD_GPASID_CD (1 << 5) /* PASID-level cache disable */ #define IOMMU_SVA_VTD_GPASID_CD (1 << 5) /* PASID-level cache disable */
#define IOMMU_SVA_VTD_GPASID_LAST (1 << 6)
__u64 flags; __u64 flags;
__u32 pat; __u32 pat;
__u32 emt; __u32 emt;