[PATCH] virtio: fix crash if CQ is not negotiated

[PATCH] virtio: fix crash if CQ is not negotiated

[Damjan Marion]

Fix NULL dereference if virtio control queue is not negotiated.

Signed-off-by: Damjan Marion <damarion@cisco.com>
---
 drivers/net/virtio/virtio_ethdev.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index f74e413..3633fce 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -114,19 +114,20 @@ static int
 virtio_send_command(struct virtqueue *vq, struct virtio_pmd_ctrl *ctrl,
 		int *dlen, int pkt_num)
 {
-	uint16_t head = vq->vq_desc_head_idx, i;
+	uint32_t head, i;
 	int k, sum = 0;
 	virtio_net_ctrl_ack status = ~0;
 	struct virtio_pmd_ctrl result;
 
 	ctrl->status = status;
 
-	if (!vq->hw->cvq) {
+	if (!(vq && vq->hw->cvq)) {
 		PMD_INIT_LOG(ERR,
 			     "%s(): Control queue is not supported.",
 			     __func__);
 		return -1;
 	}
+	head = vq->vq_desc_head_idx;
 
 	PMD_INIT_LOG(DEBUG, "vq->vq_desc_head_idx = %d, status = %d, "
 		"vq->hw->cvq = %p vq = %p",
-- 
2.1.4

Re: [PATCH] virtio: fix crash if CQ is not negotiated

[Stephen Hemminger]

On Mon, 25 May 2015 12:20:52 +0200
Damjan Marion <damarion@cisco.com> wrote:

> Fix NULL dereference if virtio control queue is not negotiated.
> 
> Signed-off-by: Damjan Marion <damarion@cisco.com>

This is good belt and suspenders thing to have, but did you see early
patches to check the feature bits and not call this code?

Acked-by: Stephen Hemminger <stephen@networkplumber.org>

Re: [PATCH] virtio: fix crash if CQ is not negotiated

[Thomas Monjalon]

> > Fix NULL dereference if virtio control queue is not negotiated.
> > 
> > Signed-off-by: Damjan Marion <damarion@cisco.com>
> 
> This is good belt and suspenders thing to have, but did you see early
> patches to check the feature bits and not call this code?
> 
> Acked-by: Stephen Hemminger <stephen@networkplumber.org>

Applied, thanks