On Wed, 27 Dec 2023 22:41:07 +0800, Zhu Yanjun <yanjun.zhu@xxxxxxxxx> wrote:
>
> 在 2023/12/27 22:26, Zhu Yanjun 写道:
> > From: Zhu Yanjun <yanjun.zhu@xxxxxxxxx>
> >
> > Fix the warnings when building virtio_net driver.
> >
> > "
> > drivers/net/virtio_net.c: In function ‘init_vqs’:
> > drivers/net/virtio_net.c:4551:48: warning: ‘%d’ directive writing between 1 and 11 bytes into a region of size 10 [-Wformat-overflow=]
> > 4551 | sprintf(vi->rq[i].name, "input.%d", i);
> > | ^~
> > In function ‘virtnet_find_vqs’,
> > inlined from ‘init_vqs’ at drivers/net/virtio_net.c:4645:8:
> > drivers/net/virtio_net.c:4551:41: note: directive argument in the range [-2147483643, 65534]
> > 4551 | sprintf(vi->rq[i].name, "input.%d", i);
> > | ^~~~~~~~~~
> > drivers/net/virtio_net.c:4551:17: note: ‘sprintf’ output between 8 and 18 bytes into a destination of size 16
> > 4551 | sprintf(vi->rq[i].name, "input.%d", i);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> > drivers/net/virtio_net.c: In function ‘init_vqs’:
> > drivers/net/virtio_net.c:4552:49: warning: ‘%d’ directive writing between 1 and 11 bytes into a region of size 9 [-Wformat-overflow=]
> > 4552 | sprintf(vi->sq[i].name, "output.%d", i);
> > | ^~
> > In function ‘virtnet_find_vqs’,
> > inlined from ‘init_vqs’ at drivers/net/virtio_net.c:4645:8:
> > drivers/net/virtio_net.c:4552:41: note: directive argument in the range [-2147483643, 65534]
> > 4552 | sprintf(vi->sq[i].name, "output.%d", i);
> > | ^~~~~~~~~~~
> > drivers/net/virtio_net.c:4552:17: note: ‘sprintf’ output between 9 and 19 bytes into a destination of size 16
> > 4552 | sprintf(vi->sq[i].name, "output.%d", i);
> >
> > "
>
> Hi, all
>
> V1->V2: Add commit logs. Format string is changed.
>
> Best Regards,
>
> Zhu Yanjun
>
> > Reviewed-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx>
> > Signed-off-by: Zhu Yanjun <yanjun.zhu@xxxxxxxxx>
> > ---
You can put the changes log after "---" inside the patch.
Thanks.
> > drivers/net/virtio_net.c | 9 +++++----
> > 1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
> > index d16f592c2061..89a15cc81396 100644
> > --- a/drivers/net/virtio_net.c
> > +++ b/drivers/net/virtio_net.c
> > @@ -4096,10 +4096,11 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
> > {
> > vq_callback_t **callbacks;
> > struct virtqueue **vqs;
> > - int ret = -ENOMEM;
> > - int i, total_vqs;
> > const char **names;
> > + int ret = -ENOMEM;
> > + int total_vqs;
> > bool *ctx;
> > + u16 i;
> >
> > /* We expect 1 RX virtqueue followed by 1 TX virtqueue, followed by
> > * possible N-1 RX/TX queue pairs used in multiqueue mode, followed by
> > @@ -4136,8 +4137,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi)
> > for (i = 0; i < vi->max_queue_pairs; i++) {
> > callbacks[rxq2vq(i)] = skb_recv_done;
> > callbacks[txq2vq(i)] = skb_xmit_done;
> > - sprintf(vi->rq[i].name, "input.%d", i);
> > - sprintf(vi->sq[i].name, "output.%d", i);
> > + sprintf(vi->rq[i].name, "input.%u", i);
> > + sprintf(vi->sq[i].name, "output.%u", i);
> > names[rxq2vq(i)] = vi->rq[i].name;
> > names[txq2vq(i)] = vi->sq[i].name;
> > if (ctx)
