vhost: move vdpa group bound check to vhost_vdpa

Remove duplication by consolidating these here.  This reduces the
posibility of a parent driver missing them.

While we're at it, fix a bug in vdpa_sim where a valid ASID can be
assigned to a group equal to ngroups, causing an out of bound write.

Cc: stable@vger.kernel.org
Fixes: bda324fd037a ("vdpasim: control virtqueue support")
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20260119143306.1818855-2-eperezma@redhat.com>

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index ddaa1366704bb0026849e654347f5eff3d849580..44062e9d68f0061cf999767aaf53ae82f1d75c70 100644 (file)
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -3640,9 +3640,6 @@ static int mlx5_set_group_asid(struct vdpa_device *vdev, u32 group,
        struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);
        int err = 0;
 
-       if (group >= MLX5_VDPA_NUMVQ_GROUPS)
-               return -EINVAL;
-
        mvdev->mres.group2asid[group] = asid;
 
        mutex_lock(&mvdev->mres.lock);

diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index c1c6431950e1b1917af981d400639e40daa0aaef..df9c7ddc5d782705b050f76881b610c6065b1943 100644 (file)
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -606,12 +606,6 @@ static int vdpasim_set_group_asid(struct vdpa_device *vdpa, unsigned int group,
        struct vhost_iotlb *iommu;
        int i;
 
-       if (group > vdpasim->dev_attr.ngroups)
-               return -EINVAL;
-
-       if (asid >= vdpasim->dev_attr.nas)
-               return -EINVAL;
-
        iommu = &vdpasim->iommu[asid];
 
        mutex_lock(&vdpasim->mutex);

diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index 05a481e4c385a0cf9aa505ad90ab3858c784803b..9d25b735b43dd34d31f83d14ed7bf84132f831e1 100644 (file)
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -680,7 +680,7 @@ static long vhost_vdpa_vring_ioctl(struct vhost_vdpa *v, unsigned int cmd,
        case VHOST_VDPA_SET_GROUP_ASID:
                if (copy_from_user(&s, argp, sizeof(s)))
                        return -EFAULT;
-               if (s.num >= vdpa->nas)
+               if (idx >= vdpa->ngroups || s.num >= vdpa->nas)
                        return -EINVAL;
                if (!ops->set_group_asid)
                        return -EOPNOTSUPP;