vfio: Fixes in iommufd vfio token handling
Subsystems (5)
v2 cover vfio: Fixes in iommufd vfio token handling
Hello,
The series includes a couple of bug fixes that were accidentally introduced as a part of VFIO's vf_token management for iommufd.
Patch-1: Fixes ksize arg while copying user struct in vfio_df_ioctl_bind_iommufd.
Patch-2: Adds missing .match_token_uuid callback in hisi_acc_vfio_pci_migrn_ops.
Thank you.
Raghavendra
Raghavendra Rao Ananta (2):
vfio: Fix ksize arg while copying user struct in
vfio_df_ioctl_bind_iommufd()
hisi_acc_vfio_pci: Add .match_token_uuid callback in
hisi_acc_vfio_pci_migrn_ops
drivers/vfio/device_cdev.c | 2 +- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
base-commit: 3a8660878839faadb4f1a6dd72c3179c1df56787
Signature · 1 line
2.51.1.930.gacf6e81ea2-goog
PATCH v2 1/2 vfio: Fix ksize arg while copying user struct in vfio_df_ioctl_bind_iommufd()
For the cases where user includes a non-zero value in 'token_uuid_ptr' field of 'struct vfio_device_bind_iommufd', the copy_struct_from_user() in vfio_df_ioctl_bind_iommufd() fails with -E2BIG. For the 'minsz' passed, copy_struct_from_user() expects the newly introduced field to be zero-ed, which would be incorrect in this case.
Fix this by passing the actual size of the kernel struct. If working with a newer userspace, copy_struct_from_user() would copy the 'token_uuid_ptr' field, and if working with an old userspace, it would zero out this field, thus still retaining backward compatibility.
--- drivers/vfio/device_cdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/device_cdev.c +1 -1
@@ -99,7 +99,7 @@ long vfio_df_ioctl_bind_iommufd(struct vfio_device_file *df,return ret;if (user_size < minsz)return -EINVAL ; - ret =copy_struct_from_user (&bind, minsz, arg, user_size); + ret =copy_struct_from_user (&bind,sizeof (bind), arg, user_size);if (ret)return ret;
Signature · 1 line
2.51.1.930.gacf6e81ea2-goog
PATCH v2 2/2 hisi_acc_vfio_pci: Add .match_token_uuid callback in hisi_acc_vfio_pci_migrn_ops
In reply to Raghavendra Rao AnantaThe commit, <86624ba3b522> ("vfio/pci: Do vf_token checks for VFIO_DEVICE_BIND_IOMMUFD") accidentally ignored including the .match_token_uuid callback in the hisi_acc_vfio_pci_migrn_ops struct. Introduce the missed callback here.
--- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + 1 file changed, 1 insertion(+)
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +1 -0
@@ -1564,6 +1564,7 @@ static const struct vfio_device_ops hisi_acc_vfio_pci_migrn_ops = { .mmap = hisi_acc_vfio_pci_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
Signature · 1 line
2.51.1.930.gacf6e81ea2-goog
Re: [PATCH v2 2/2] hisi_acc_vfio_pci: Add .match_token_uuid callback in hisi_acc_vfio_pci_migrn_ops
Quoted 5 lines · Raghavendra Rao Ananta
The commit, <
86624ba3b522> ("vfio/pci: Dovf_tokenchecks forVFIO_DEVICE_BIND_IOMMUFD") accidentally ignored including the .match_token_uuid callback in thehisi_acc_vfio_pci_migrn_opsstruct. Introduce the missed callback here.
Quoted 7 lines
Fixes 86624ba3b522 ("vfio/pci: Do vf_token checks for VFIO_DEVICE_BIND_IOMMUFD")Suggested-by Longfang Liu <[email protected]>Signed-off-by Raghavendra Rao Ananta <[email protected]>--- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + 1 file changed, 1 insertion(+)
Jason
Re: [PATCH v2 2/2] hisi_acc_vfio_pci: Add .match_token_uuid callback in hisi_acc_vfio_pci_migrn_ops
In reply to Raghavendra Rao AnantaQuoted 19 lines · Raghavendra Rao Ananta
The commit, <
86624ba3b522> ("vfio/pci: Dovf_tokenchecks forVFIO_DEVICE_BIND_IOMMUFD") accidentally ignored including the .match_token_uuid callback in thehisi_acc_vfio_pci_migrn_opsstruct. Introduce the missed callback here.Fixes 86624ba3b522 ("vfio/pci: Do vf_token checks for VFIO_DEVICE_BIND_IOMMUFD")Suggested-by Longfang Liu <[email protected]>Signed-off-by Raghavendra Rao Ananta <[email protected]>--- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + 1 file changed, 1 insertion(+)drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +0
-0
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c static const struct vfio_device_ops hisi_acc_vfio_pci_migrn_ops = { · line 1570
Quoted 7 lines
drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c +1
-0@@ -1564,6 +1564,7 @@ static const struct vfio_device_ops hisi_acc_vfio_pci_migrn_ops = { .mmap = hisi_acc_vfio_pci_mmap, .request = vfio_pci_core_request, .match = vfio_pci_core_match, + .match_token_uuid = vfio_pci_core_match_token_uuid, .bind_iommufd = vfio_iommufd_physical_bind, .unbind_iommufd = vfio_iommufd_physical_unbind, .attach_ioas = vfio_iommufd_physical_attach_ioas,
Thanks.
Longfang.
Quoted 20 lines · On Fri, 31 Oct 2025 17:06:01 +0000 Raghavendra Rao Ananta <[email protected]>…
Hello,
The series includes a couple of bug fixes that were accidentally introduced as a part of VFIO's
vf_tokenmanagement for iommufd.Patch-1: Fixes ksize arg while copying user struct in
vfio_df_ioctl_bind_iommufd.Patch-2: Adds missing .match_token_uuid callback in
hisi_acc_vfio_pci_migrn_ops.Thank you.
RaghavendraRaghavendra Rao Ananta (2):
vfio: Fix ksize arg while copying user struct in
vfio_df_ioctl_bind_iommufd()
hisi_acc_vfio_pci: Add .match_token_uuid callback in
hisi_acc_vfio_pci_migrn_ops
Quoted 6 lines
drivers/vfio/device_cdev.c | 2 +- drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)base-commit:
3a8660878839faadb4f1a6dd72c3179c1df56787
Applied to vfio next branch for v6.19. Thanks,
Alex