]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
virtio_net: Fix "‘%d’ directive writing between 1 and 11 bytes into a region of size...
authorZhu Yanjun <yanjun.zhu@linux.dev>
Thu, 4 Jan 2024 02:09:02 +0000 (10:09 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 12 Jan 2024 00:54:34 +0000 (16:54 -0800)
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);

"

Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Zhu Yanjun <yanjun.zhu@linux.dev>
Link: https://lore.kernel.org/r/20240104020902.2753599-1-yanjun.zhu@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/virtio_net.c

index 3cb8aa19388415f8f7208f45827514f8c6299f28..d7ce4a1011ea2585bca21ab3fb86978f7fee364d 100644 (file)
@@ -4295,10 +4295,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
@@ -4335,8 +4336,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)