OSDN Git Service

virtio-vdpa: Fix unchecked call to NULL set_vq_affinity
authorDragos Tatulea <dtatulea@nvidia.com>
Thu, 4 May 2023 13:50:52 +0000 (16:50 +0300)
committerMichael S. Tsirkin <mst@redhat.com>
Tue, 27 Jun 2023 14:47:08 +0000 (10:47 -0400)
The referenced patch calls set_vq_affinity without checking if the op is
valid. This patch adds the check.

Fixes: 3dad56823b53 ("virtio-vdpa: Support interrupt affinity spreading mechanism")
Reviewed-by: Gal Pressman <gal@nvidia.com>
Signed-off-by: Dragos Tatulea <dtatulea@nvidia.com>
Message-Id: <20230504135053.2283816-1-dtatulea@nvidia.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Feng Liu <feliu@nvidia.com>
drivers/virtio/virtio_vdpa.c

index eb6aee8..989e2d7 100644 (file)
@@ -385,7 +385,9 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
                        err = PTR_ERR(vqs[i]);
                        goto err_setup_vq;
                }
-               ops->set_vq_affinity(vdpa, i, &masks[i]);
+
+               if (ops->set_vq_affinity)
+                       ops->set_vq_affinity(vdpa, i, &masks[i]);
        }
 
        cb.callback = virtio_vdpa_config_cb;