From patchwork Tue Dec 5 14:18:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 13480256 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="f8z3MVPz" Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E936CA for ; Tue, 5 Dec 2023 06:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701785955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2FwUnRexMbJ1eWu7b0mx103R9bklO0D/KfjDegM/pc=; b=f8z3MVPzcadHKsovB8rhvB1xhFVf/ed7Z3Hb6UV7MesbWRCtZDDCMcJx+IjdJCWf0LXeU4 XD8Mll60wA/LL9uaOvkmTZZMR1AUjpPLwPkbQUYvaHAY41nhhAlVLdAYQ2VqszXRdc8emw QSIoVM+CaEM19KdNxhMQe119UGrTrR0= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-Hw2K6gyFNtS8WtP7wZHbSQ-1; Tue, 05 Dec 2023 09:18:43 -0500 X-MC-Unique: Hw2K6gyFNtS8WtP7wZHbSQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9218638130AC; Tue, 5 Dec 2023 14:18:42 +0000 (UTC) Received: from localhost (unknown [10.39.195.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 117495B7C; Tue, 5 Dec 2023 14:18:41 +0000 (UTC) From: Stefan Hajnoczi To: "Michael S. Tsirkin" Cc: David.Laight@aculab.com, Xuan Zhuo , linux-block@vger.kernel.org, Paolo Bonzini , Jens Axboe , Jason Wang , virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Stefan Hajnoczi , Suwan Kim , kernel test robot Subject: [PATCH v2] virtio_blk: fix snprintf truncation compiler warning Date: Tue, 5 Dec 2023 09:18:40 -0500 Message-ID: <20231205141840.1854409-1-stefanha@redhat.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Commit 4e0400525691 ("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. The only place where a 16-bit value is needed is during the config space access. Use unsigned int and "%u" consistently to solve the compiler warning and clean up the code. Cc: Suwan Kim Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202312041509.DIyvEt9h-lkp@intel.com/ Signed-off-by: Stefan Hajnoczi Reviewed-by: Chaitanya Kulkarni --- drivers/block/virtio_blk.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) v2: - Use unsigned int instead of unsigned short [David] diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index d53d6aa8ee69..dc69a40fbf08 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -1019,20 +1019,23 @@ static void virtblk_config_changed(struct virtio_device *vdev) static int init_vq(struct virtio_blk *vblk) { int err; - int i; + unsigned int i; vq_callback_t **callbacks; const char **names; struct virtqueue **vqs; - unsigned short num_vqs; + unsigned int num_vqs; unsigned int num_poll_vqs; struct virtio_device *vdev = vblk->vdev; struct irq_affinity desc = { 0, }; + u16 num_vqs_u16; err = virtio_cread_feature(vdev, VIRTIO_BLK_F_MQ, struct virtio_blk_config, num_queues, - &num_vqs); + &num_vqs_u16); if (err) num_vqs = 1; + else + num_vqs = num_vqs_u16; if (!err && !num_vqs) { dev_err(&vdev->dev, "MQ advertised but zero queues reported\n"); @@ -1068,13 +1071,13 @@ static int init_vq(struct virtio_blk *vblk) for (i = 0; i < num_vqs - num_poll_vqs; i++) { 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; } for (; i < num_vqs; i++) { 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; }