From 43ec842ca45d1b090998aff20c64eb92cc8bdf0b Mon Sep 17 00:00:00 2001 From: Didier Pallard Date: Thu, 14 Dec 2017 15:33:43 +0100 Subject: [PATCH] net/virtio: fix incorrect cast The rx_queues and tx_queues fields of the data structure points to a struct virtnet_rx or virtnet_tx. Casting it to a virtqueue is an error. It does not trigger any bug because pointer is not dereferenced inside the function, but it can become a bug if this code is copy/pasted and vq is dereferenced. Fixes: 01ad44fd374f ("net/virtio: split Rx/Tx queue") Cc: stable@dpdk.org Signed-off-by: Didier Pallard Signed-off-by: Olivier Matz Reviewed-by: Maxime Coquelin Acked-by: Yuanhan Liu --- drivers/net/virtio/virtio_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index 60cc1c02e9..91321f9581 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -864,7 +864,7 @@ static int virtio_dev_xstats_get_names(struct rte_eth_dev *dev, /* Note: limit checked in rte_eth_xstats_names() */ for (i = 0; i < dev->data->nb_rx_queues; i++) { - struct virtqueue *rxvq = dev->data->rx_queues[i]; + struct virtnet_rx *rxvq = dev->data->rx_queues[i]; if (rxvq == NULL) continue; for (t = 0; t < VIRTIO_NB_RXQ_XSTATS; t++) { @@ -877,7 +877,7 @@ static int virtio_dev_xstats_get_names(struct rte_eth_dev *dev, } for (i = 0; i < dev->data->nb_tx_queues; i++) { - struct virtqueue *txvq = dev->data->tx_queues[i]; + struct virtnet_tx *txvq = dev->data->tx_queues[i]; if (txvq == NULL) continue; for (t = 0; t < VIRTIO_NB_TXQ_XSTATS; t++) { -- 2.20.1