[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling
From: |
Markus Armbruster |
Subject: |
[PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling |
Date: |
Mon, 20 Apr 2020 10:32:27 +0200 |
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
check_cache_dropped() calls error_setg() in a loop. It fails to break
the loop in one instance. If a subsequent iteration error_setg()s
again, it trips error_setv()'s assertion.
Fix it to break the loop.
Fixes: 31be8a2a97ecba7d31a82932286489cac318e9e9
Cc: Stefan Hajnoczi <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
block/file-posix.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index 7e19bbff5f..094e3b0212 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2691,10 +2691,13 @@ static void check_cache_dropped(BlockDriverState *bs,
Error **errp)
vec_end = DIV_ROUND_UP(length, page_size);
for (i = 0; i < vec_end; i++) {
if (vec[i] & 0x1) {
- error_setg(errp, "page cache still in use!");
break;
}
}
+ if (i < vec_end) {
+ error_setg(errp, "page cache still in use!");
+ break;
+ }
}
if (window) {
--
2.21.1
- [PATCH 06/11] fdc: Fix fallback=auto error handling, (continued)
- [PATCH 06/11] fdc: Fix fallback=auto error handling, Markus Armbruster, 2020/04/20
- [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 <=
- [PATCH 04/11] cpus: Proper range-checking for -icount shift=N, Markus Armbruster, 2020/04/20
- [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