virtio_ring: Initialize vring_size_in_bytes

[PATCH] virtio_ring: Initialize vring_size_in_bytes

Posted by trix@redhat.com 4 years, 3 months ago

From: Tom Rix <trix@redhat.com>

On the clang build, there is this error
virtio_ring.c:1772:26: error: variable 'ring_size_in_bytes'
  is uninitialized when used here
  vring_free_queue(vdev, ring_size_in_bytes,
                         ^~~~~~~~~~~~~~~~~~

ring_dma_addr was intialized twice, once with the ring_size_in_bytes.
value.  So fix typo.

Signed-off-by: Tom Rix <trix@redhat.com>
---
 drivers/virtio/virtio_ring.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index 905c882600618..b2b567ebb9120 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -1756,7 +1756,7 @@ static void vring_free_vring_packed(struct vring_packed *vring,
 	ring                  = vring->ring;
 	driver                = vring->driver;
 	device                = vring->device;
-	ring_dma_addr         = vring->ring_size_in_bytes;
+	ring_size_in_bytes    = vring->ring_size_in_bytes;
 	event_size_in_bytes   = vring->event_size_in_bytes;
 	ring_dma_addr         = vring->ring_dma_addr;
 	driver_event_dma_addr = vring->driver_event_dma_addr;
-- 
2.26.3

Re: [PATCH] virtio_ring: Initialize vring_size_in_bytes

Posted by Nathan Chancellor 4 years, 3 months ago

On Mon, Mar 07, 2022 at 09:49:16AM -0800, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
> 
> On the clang build, there is this error
> virtio_ring.c:1772:26: error: variable 'ring_size_in_bytes'
>   is uninitialized when used here
>   vring_free_queue(vdev, ring_size_in_bytes,
>                          ^~~~~~~~~~~~~~~~~~
> 
> ring_dma_addr was intialized twice, once with the ring_size_in_bytes.
> value.  So fix typo.
> 
> Signed-off-by: Tom Rix <trix@redhat.com>

I was getting ready to send the same patch.

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
>  drivers/virtio/virtio_ring.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
> index 905c882600618..b2b567ebb9120 100644
> --- a/drivers/virtio/virtio_ring.c
> +++ b/drivers/virtio/virtio_ring.c
> @@ -1756,7 +1756,7 @@ static void vring_free_vring_packed(struct vring_packed *vring,
>  	ring                  = vring->ring;
>  	driver                = vring->driver;
>  	device                = vring->device;
> -	ring_dma_addr         = vring->ring_size_in_bytes;
> +	ring_size_in_bytes    = vring->ring_size_in_bytes;
>  	event_size_in_bytes   = vring->event_size_in_bytes;
>  	ring_dma_addr         = vring->ring_dma_addr;
>  	driver_event_dma_addr = vring->driver_event_dma_addr;
> -- 
> 2.26.3
> 
>