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 <[email protected]>
Reviewed-by: Eric Auger <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Joerg Roedel <[email protected]>

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index f1c66c94be555933de065d4df4305fe2c83a596a..cae400b6807ef27298e1fdd114590fc0a9014962 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -5398,8 +5398,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 99353d6468fa2031a774dc593ceb23b5283ad014..0cb9a15f1112794b2348fce05c6903f4da60f052 100644 (file)
--- a/drivers/iommu/intel/svm.c
+++ b/drivers/iommu/intel/svm.c
@@ -284,8 +284,15 @@ 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;
+
+       /* Make sure no undefined flags are used in vendor data */
+       if (data->vendor.vtd.flags & ~(IOMMU_SVA_VTD_GPASID_LAST - 1))
                return -EINVAL;
 
        if (!dev_is_pci(dev))

diff --git a/include/uapi/linux/iommu.h b/include/uapi/linux/iommu.h
index 66d4ca40b40f83000313b0de691577a01f532efa..e1d9e75f2c947155142b1c58c8540f80f7a0da7b 100644 (file)
--- a/include/uapi/linux/iommu.h
+++ b/include/uapi/linux/iommu.h
@@ -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_EMTE      (1 << 4) /* extended mem type enable */
 #define IOMMU_SVA_VTD_GPASID_CD                (1 << 5) /* PASID-level cache disable */
+#define IOMMU_SVA_VTD_GPASID_LAST      (1 << 6)
        __u64 flags;
        __u32 pat;
        __u32 emt;