mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
virtio_blk: fix snprintf truncation compiler warning
[ Upstream commitb8e0792449
] Commit4e04005256
("virtio-blk: support polling I/O") triggers the following gcc 13 W=1 warnings: drivers/block/virtio_blk.c: In function ‘init_vq’: drivers/block/virtio_blk.c:1077:68: warning: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 7 [-Wformat-truncation=] 1077 | snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%d", i); | ^~ drivers/block/virtio_blk.c:1077:58: note: directive argument in the range [-2147483648, 65534] 1077 | snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%d", i); | ^~~~~~~~~~~~~ drivers/block/virtio_blk.c:1077:17: note: ‘snprintf’ output between 11 and 21 bytes into a destination of size 16 1077 | snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%d", i); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is a false positive because the lower bound -2147483648 is incorrect. The true range of i is [0, num_vqs - 1] where 0 < num_vqs < 65536. The code mixes int, unsigned short, and unsigned int types in addition to using "%d" for an unsigned value. Use unsigned short and "%u" consistently to solve the compiler warning. Cc: Suwan Kim <suwan.kim027@gmail.com> Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202312041509.DIyvEt9h-lkp@intel.com/ Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-Id: <20231204140743.1487843-1-stefanha@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ffcaafdb8b
commit
79aa992c80
1 changed files with 4 additions and 4 deletions
|
@ -1021,12 +1021,12 @@ static void virtblk_config_changed(struct virtio_device *vdev)
|
||||||
static int init_vq(struct virtio_blk *vblk)
|
static int init_vq(struct virtio_blk *vblk)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
int i;
|
unsigned short i;
|
||||||
vq_callback_t **callbacks;
|
vq_callback_t **callbacks;
|
||||||
const char **names;
|
const char **names;
|
||||||
struct virtqueue **vqs;
|
struct virtqueue **vqs;
|
||||||
unsigned short num_vqs;
|
unsigned short num_vqs;
|
||||||
unsigned int num_poll_vqs;
|
unsigned short num_poll_vqs;
|
||||||
struct virtio_device *vdev = vblk->vdev;
|
struct virtio_device *vdev = vblk->vdev;
|
||||||
struct irq_affinity desc = { 0, };
|
struct irq_affinity desc = { 0, };
|
||||||
|
|
||||||
|
@ -1070,13 +1070,13 @@ static int init_vq(struct virtio_blk *vblk)
|
||||||
|
|
||||||
for (i = 0; i < num_vqs - num_poll_vqs; i++) {
|
for (i = 0; i < num_vqs - num_poll_vqs; i++) {
|
||||||
callbacks[i] = virtblk_done;
|
callbacks[i] = virtblk_done;
|
||||||
snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req.%d", i);
|
snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req.%u", i);
|
||||||
names[i] = vblk->vqs[i].name;
|
names[i] = vblk->vqs[i].name;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (; i < num_vqs; i++) {
|
for (; i < num_vqs; i++) {
|
||||||
callbacks[i] = NULL;
|
callbacks[i] = NULL;
|
||||||
snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%d", i);
|
snprintf(vblk->vqs[i].name, VQ_NAME_LEN, "req_poll.%u", i);
|
||||||
names[i] = vblk->vqs[i].name;
|
names[i] = vblk->vqs[i].name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue