On Thu, Oct 17, 2024 at 1:27 AM Michael S. Tsirkin <mst@xxxxxxxxxx> wrote:
>
> Static analysis on linux-next has detected the following issue
> in function virtnet_stats_ctx_init, in drivers/net/virtio_net.c :
>
> if (vi->device_stats_cap & VIRTIO_NET_STATS_TYPE_CVQ) {
> queue_type = VIRTNET_Q_TYPE_CQ;
> ctx->bitmap[queue_type] |= VIRTIO_NET_STATS_TYPE_CVQ;
> ctx->desc_num[queue_type] += ARRAY_SIZE(virtnet_stats_cvq_desc);
> ctx->size[queue_type] += sizeof(struct virtio_net_stats_cvq);
> }
>
> ctx->bitmap is declared as a u32 however it is being bit-wise or'd with
> VIRTIO_NET_STATS_TYPE_CVQ and this is defined as 1 << 32:
>
> include/uapi/linux/virtio_net.h:#define VIRTIO_NET_STATS_TYPE_CVQ (1ULL << 32)
>
> ..and hence the bit-wise or operation won't set any bits in ctx->bitmap
> because 1ULL < 32 is too wide for a u32.
>
> In fact, the field is read into a u64:
>
> u64 offset, bitmap;
> ....
> bitmap = ctx->bitmap[queue_type];
>
> so to fix, it is enough to make bitmap an array of u64.
>
> Fixes: 941168f8b40e5 ("virtio_net: support device stats")
> Reported-by: "Colin King (gmail)" <colin.i.king@xxxxxxxxx>
> Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
> ---
Acked-by: Jason Wang <jasowang@xxxxxxxxxx>
Thanks
