qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Bin Meng" <bin.meng@windriver.com>,
	"Stefan Weil" <sw@weilnetz.de>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 03/12] util/aio-win32: Correct the event array size in aio_poll()
Date: Sun,  6 Nov 2022 09:51:06 +0100	[thread overview]
Message-ID: <20221106085115.257018-4-pbonzini@redhat.com> (raw)
In-Reply-To: <20221106085115.257018-1-pbonzini@redhat.com>

From: Bin Meng <bin.meng@windriver.com>

WaitForMultipleObjects() can only wait for MAXIMUM_WAIT_OBJECTS
object handles. Correct the event array size in aio_poll() and
add a assert() to ensure it does not cause out of bound access.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20221019102015.2441622-3-bmeng.cn@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 util/aio-win32.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/util/aio-win32.c b/util/aio-win32.c
index 44003d645ecd..80cfe012ad8f 100644
--- a/util/aio-win32.c
+++ b/util/aio-win32.c
@@ -326,9 +326,9 @@ void aio_dispatch(AioContext *ctx)
 bool aio_poll(AioContext *ctx, bool blocking)
 {
     AioHandler *node;
-    HANDLE events[MAXIMUM_WAIT_OBJECTS + 1];
+    HANDLE events[MAXIMUM_WAIT_OBJECTS];
     bool progress, have_select_revents, first;
-    int count;
+    unsigned count;
     int timeout;
 
     /*
@@ -369,6 +369,7 @@ bool aio_poll(AioContext *ctx, bool blocking)
     QLIST_FOREACH_RCU(node, &ctx->aio_handlers, node) {
         if (!node->deleted && node->io_notify
             && aio_node_check(ctx, node->is_external)) {
+            assert(count < MAXIMUM_WAIT_OBJECTS);
             events[count++] = event_notifier_get_handle(node->e);
         }
     }
-- 
2.38.1



  parent reply	other threads:[~2022-11-06  8:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-06  8:51 [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2 Paolo Bonzini
2022-11-06  8:51 ` [PULL 01/12] util/main-loop: Fix maximum number of wait objects for win32 Paolo Bonzini
2022-11-06  8:51 ` [PULL 02/12] util/main-loop: Avoid adding the same HANDLE twice Paolo Bonzini
2022-11-06  8:51 ` Paolo Bonzini [this message]
2022-11-06  8:51 ` [PULL 04/12] gdb-xml: Fix size of EFER register on i386 architecture when debugged by GDB Paolo Bonzini
2022-11-06  8:51 ` [PULL 05/12] Fix broken configure with -Wunused-parameter Paolo Bonzini
2022-11-06  8:51 ` [PULL 06/12] meson: avoid unused arguments of main() in compiler tests Paolo Bonzini
2022-11-06  8:51 ` [PULL 07/12] Add missing include statement for global xml_builtin Paolo Bonzini
2022-11-06  8:51 ` [PULL 08/12] module: removed unused function argument "mayfail" Paolo Bonzini
2022-11-06  8:51 ` [PULL 09/12] module: rename module_load_one to module_load Paolo Bonzini
2022-11-06  8:51 ` [PULL 10/12] module: add Error arguments to module_load and module_load_qom Paolo Bonzini
2022-11-06  8:51 ` [PULL 11/12] dmg: warn when opening dmg images containing blocks of unknown type Paolo Bonzini
2022-11-06  8:51 ` [PULL 12/12] accel: abort if we fail to load the accelerator plugin Paolo Bonzini
2022-11-07  8:35   ` Claudio Fontana
2022-11-07 20:03 ` [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2 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=20221106085115.257018-4-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=berrange@redhat.com \
    --cc=bin.meng@windriver.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    /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).