[PATCH v2] iommufd: Add three missing structures in ucmd_buffer

[PATCH v2] iommufd: Add three missing structures in ucmd_buffer

[Yi Liu]

struct iommu_ioas_copy, struct iommu_option and struct iommu_vfio_ioas
are missed in ucmd_buffer. Although they are smaller than the size of
ucmd_buffer, it is safer to list them in ucmd_buffer explicitly.

Fixes: aad37e71d5c4 ("iommufd: IOCTLs for the io_pagetable")
Fixes: d624d6652a65 ("iommufd: vfio container FD ioctl compatibility")
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
---
v2:
  - add iommu_ioas_copy as KevinT pointed

v1: https://lore.kernel.org/kvm/20230120055757.67879-1-yi.l.liu@intel.com/

 drivers/iommu/iommufd/main.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/iommu/iommufd/main.c b/drivers/iommu/iommufd/main.c
index 083e6fcbe10a..3fbe636c3d8a 100644
--- a/drivers/iommu/iommufd/main.c
+++ b/drivers/iommu/iommufd/main.c
@@ -252,9 +252,12 @@ union ucmd_buffer {
 	struct iommu_destroy destroy;
 	struct iommu_ioas_alloc alloc;
 	struct iommu_ioas_allow_iovas allow_iovas;
+	struct iommu_ioas_copy ioas_copy;
 	struct iommu_ioas_iova_ranges iova_ranges;
 	struct iommu_ioas_map map;
 	struct iommu_ioas_unmap unmap;
+	struct iommu_option option;
+	struct iommu_vfio_ioas vfio_ioas;
 #ifdef CONFIG_IOMMUFD_TEST
 	struct iommu_test_cmd test;
 #endif
-- 
2.34.1

Re: [PATCH v2] iommufd: Add three missing structures in ucmd_buffer

[Jason Gunthorpe]

On Fri, Jan 20, 2023 at 04:20:40AM -0800, Yi Liu wrote:
> struct iommu_ioas_copy, struct iommu_option and struct iommu_vfio_ioas
> are missed in ucmd_buffer. Although they are smaller than the size of
> ucmd_buffer, it is safer to list them in ucmd_buffer explicitly.
> 
> Fixes: aad37e71d5c4 ("iommufd: IOCTLs for the io_pagetable")
> Fixes: d624d6652a65 ("iommufd: vfio container FD ioctl compatibility")
> Signed-off-by: Yi Liu <yi.l.liu@intel.com>
> ---
> v2:
>   - add iommu_ioas_copy as KevinT pointed
> 
> v1: https://lore.kernel.org/kvm/20230120055757.67879-1-yi.l.liu@intel.com/

Applied thanks

Jason