[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 04/11] cpus: Proper range-checking for -icount shift=N
From: |
Markus Armbruster |
Subject: |
[PATCH 04/11] cpus: Proper range-checking for -icount shift=N |
Date: |
Mon, 20 Apr 2020 10:32:29 +0200 |
timers_state.icount_time_shift must be in [0,63] to avoid undefined
behavior when shifting by it, e.g. in cpu_icount_to_ns().
icount_adjust() clamps it to [0,MAX_ICOUNT_SHIFT], with
MAX_ICOUNT_SHIFT = 10. configure_icount() doesn't. Fix that.
Fixes: a8bfac37085c3372366d722f131a7e18d664ee4d
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
cpus.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cpus.c b/cpus.c
index 1b542b37f9..5670c96bcf 100644
--- a/cpus.c
+++ b/cpus.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qemu/config-file.h"
+#include "qemu/cutils.h"
#include "migration/vmstate.h"
#include "monitor/monitor.h"
#include "qapi/error.h"
@@ -801,7 +802,6 @@ void configure_icount(QemuOpts *opts, Error **errp)
bool sleep = qemu_opt_get_bool(opts, "sleep", true);
bool align = qemu_opt_get_bool(opts, "align", false);
long time_shift = -1;
- char *rem_str = NULL;
if (!option && qemu_opt_get(opts, "align")) {
error_setg(errp, "Please specify shift option when using align");
@@ -814,9 +814,8 @@ void configure_icount(QemuOpts *opts, Error **errp)
}
if (strcmp(option, "auto") != 0) {
- errno = 0;
- time_shift = strtol(option, &rem_str, 0);
- if (errno != 0 || *rem_str != '\0' || !strlen(option)) {
+ if (qemu_strtol(option, NULL, 0, &time_shift) < 0
+ || time_shift < 0 || time_shift > MAX_ICOUNT_SHIFT) {
error_setg(errp, "icount: Invalid shift value");
return;
}
--
2.21.1
- [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() error handling, (continued)
- [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() error handling, Markus Armbruster, 2020/04/20
- [PATCH 05/11] arm/virt: Fix virt_machine_device_plug_cb() error API violation, Markus Armbruster, 2020/04/20
- [PATCH 10/11] io: Fix qio_channel_socket_close() error handling, Markus Armbruster, 2020/04/20
- [PATCH 01/11] cryptodev: Fix cryptodev_builtin_cleanup() error API violation, Markus Armbruster, 2020/04/20
- [PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling, Markus Armbruster, 2020/04/20
- [PATCH 04/11] cpus: Proper range-checking for -icount shift=N,
Markus Armbruster <=
- [PATCH 07/11] bochs-display: Fix vgamem=SIZE error handling, Markus Armbruster, 2020/04/20
- [PATCH 08/11] virtio-net: Fix duplex=... and speed=... error handling, Markus Armbruster, 2020/04/20
- [PATCH 09/11] xen/pt: Fix flawed conversion to realize(), Markus Armbruster, 2020/04/20
- Re: [PATCH 00/11] Miscellaneous error handling fixes, no-reply, 2020/04/20