[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/12] util/aio-win32: Correct the event array size in aio_poll()
From: |
Paolo Bonzini |
Subject: |
[PULL 03/12] util/aio-win32: Correct the event array size in aio_poll() |
Date: |
Sun, 6 Nov 2022 09:51:06 +0100 |
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
- [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2, Paolo Bonzini, 2022/11/06
- [PULL 01/12] util/main-loop: Fix maximum number of wait objects for win32, Paolo Bonzini, 2022/11/06
- [PULL 02/12] util/main-loop: Avoid adding the same HANDLE twice, Paolo Bonzini, 2022/11/06
- [PULL 04/12] gdb-xml: Fix size of EFER register on i386 architecture when debugged by GDB, Paolo Bonzini, 2022/11/06
- [PULL 03/12] util/aio-win32: Correct the event array size in aio_poll(),
Paolo Bonzini <=
- [PULL 05/12] Fix broken configure with -Wunused-parameter, Paolo Bonzini, 2022/11/06
- [PULL 06/12] meson: avoid unused arguments of main() in compiler tests, Paolo Bonzini, 2022/11/06
- [PULL 07/12] Add missing include statement for global xml_builtin, Paolo Bonzini, 2022/11/06
- [PULL 08/12] module: removed unused function argument "mayfail", Paolo Bonzini, 2022/11/06
- [PULL 09/12] module: rename module_load_one to module_load, Paolo Bonzini, 2022/11/06
- [PULL 10/12] module: add Error arguments to module_load and module_load_qom, Paolo Bonzini, 2022/11/06
- [PULL 11/12] dmg: warn when opening dmg images containing blocks of unknown type, Paolo Bonzini, 2022/11/06
- [PULL 12/12] accel: abort if we fail to load the accelerator plugin, Paolo Bonzini, 2022/11/06
- Re: [PULL 00/12] Misc bugfix patches (+ improved module errors) for QEMU 7.2, Stefan Hajnoczi, 2022/11/07