| From ecf0a5b7072d2962badf67445aceb17815064457 Mon Sep 17 00:00:00 2001 |
| From: Daniel Verkamp <dverkamp@chromium.org> |
| Date: Fri, 3 Jan 2020 10:40:43 -0800 |
| Subject: [PATCH] virtio-balloon: initialize all vq callbacks |
| |
| commit 5790b53390e18fdd21e70776e46d058c05eda2f2 upstream. |
| |
| Ensure that elements of the callbacks array that correspond to |
| unavailable features are set to NULL; previously, they would be left |
| uninitialized. |
| |
| Since the corresponding names array elements were explicitly set to |
| NULL, the uninitialized callback pointers would not actually be |
| dereferenced; however, the uninitialized callbacks elements would still |
| be read in vp_find_vqs_msix() and used to calculate the number of MSI-X |
| vectors required. |
| |
| Cc: stable@vger.kernel.org |
| Fixes: 86a559787e6f ("virtio-balloon: VIRTIO_BALLOON_F_FREE_PAGE_HINT") |
| Reviewed-by: Cornelia Huck <cohuck@redhat.com> |
| Signed-off-by: Daniel Verkamp <dverkamp@chromium.org> |
| Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c |
| index 848383ebe19f..d129e23cbd03 100644 |
| --- a/drivers/virtio/virtio_balloon.c |
| +++ b/drivers/virtio/virtio_balloon.c |
| @@ -473,7 +473,9 @@ static int init_vqs(struct virtio_balloon *vb) |
| names[VIRTIO_BALLOON_VQ_INFLATE] = "inflate"; |
| callbacks[VIRTIO_BALLOON_VQ_DEFLATE] = balloon_ack; |
| names[VIRTIO_BALLOON_VQ_DEFLATE] = "deflate"; |
| + callbacks[VIRTIO_BALLOON_VQ_STATS] = NULL; |
| names[VIRTIO_BALLOON_VQ_STATS] = NULL; |
| + callbacks[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL; |
| names[VIRTIO_BALLOON_VQ_FREE_PAGE] = NULL; |
| |
| if (virtio_has_feature(vb->vdev, VIRTIO_BALLOON_F_STATS_VQ)) { |
| -- |
| 2.7.4 |
| |
