qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Richard W.M. Jones" <rjones@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, stefanha@redhat.com, kwolf@redhat.com,
	hreitz@redhat.com
Subject: [PATCH [repost]] block/blkio: Don't assume size_t is 64 bit
Date: Mon, 29 Jan 2024 18:53:55 +0000	[thread overview]
Message-ID: <20240129185427.2952727-2-rjones@redhat.com> (raw)
In-Reply-To: <20240129185427.2952727-1-rjones@redhat.com>

With GCC 14 the code failed to compile on i686 (and was wrong for any
version of GCC):

../block/blkio.c: In function ‘blkio_file_open’:
../block/blkio.c:857:28: error: passing argument 3 of ‘blkio_get_uint64’ from incompatible pointer type [-Wincompatible-pointer-types]
  857 |                            &s->mem_region_alignment);
      |                            ^~~~~~~~~~~~~~~~~~~~~~~~
      |                            |
      |                            size_t * {aka unsigned int *}
In file included from ../block/blkio.c:12:
/usr/include/blkio.h:49:67: note: expected ‘uint64_t *’ {aka ‘long long unsigned int *’} but argument is of type ‘size_t *’ {aka ‘unsigned int *’}
   49 | int blkio_get_uint64(struct blkio *b, const char *name, uint64_t *value);
      |                                                         ~~~~~~~~~~^~~~~

Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
---
 block/blkio.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/block/blkio.c b/block/blkio.c
index 0a0a6c0f5fd..52d78935147 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -794,6 +794,7 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
     const char *blkio_driver = bs->drv->protocol_name;
     BDRVBlkioState *s = bs->opaque;
     int ret;
+    uint64_t val;
 
     ret = blkio_create(blkio_driver, &s->blkio);
     if (ret < 0) {
@@ -854,7 +855,7 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
 
     ret = blkio_get_uint64(s->blkio,
                            "mem-region-alignment",
-                           &s->mem_region_alignment);
+                           &val);
     if (ret < 0) {
         error_setg_errno(errp, -ret,
                          "failed to get mem-region-alignment: %s",
@@ -862,6 +863,15 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
         blkio_destroy(&s->blkio);
         return ret;
     }
+#if HOST_LONG_BITS == 32
+    if (val > SIZE_MAX) {
+        error_setg_errno(errp, ERANGE,
+                         "mem-region-alignment too large for size_t");
+        blkio_destroy(&s->blkio);
+        return -ERANGE;
+    }
+#endif
+    s->mem_region_alignment = (size_t)val;
 
     ret = blkio_get_bool(s->blkio,
                          "may-pin-mem-regions",
-- 
2.43.0



  reply	other threads:[~2024-01-29 18:56 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-29 18:53 [PATCH [repost]] block/blkio: Don't assume size_t is 64 bit Richard W.M. Jones
2024-01-29 18:53 ` Richard W.M. Jones [this message]
2024-01-29 20:41   ` Eric Blake
2024-01-30  8:51   ` Kevin Wolf
2024-01-30 10:30     ` Richard W.M. Jones
2024-01-30 12:04       ` Kevin Wolf
2024-01-30 12:19         ` Richard W.M. Jones
2024-01-30 21:13           ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240129185427.2952727-2-rjones@redhat.com \
    --to=rjones@redhat.com \
    --cc=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).