qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling
Date: Mon, 20 Apr 2020 10:32:27 +0200	[thread overview]
Message-ID: <20200420083236.19309-3-armbru@redhat.com> (raw)
In-Reply-To: <20200420083236.19309-1-armbru@redhat.com>

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 <stefanha@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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



  parent reply	other threads:[~2020-04-20  8:39 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-20  8:32 [PATCH 00/11] Miscellaneous error handling fixes Markus Armbruster
2020-04-20  8:32 ` [PATCH 01/11] cryptodev: Fix cryptodev_builtin_cleanup() error API violation Markus Armbruster
2020-04-20  8:32 ` Markus Armbruster [this message]
2020-04-20 15:05   ` [PATCH 02/11] block/file-posix: Fix check_cache_dropped() error handling Eric Blake
2020-04-20  8:32 ` [PATCH 03/11] cpus: Fix configure_icount() error API violation Markus Armbruster
2020-04-20  8:32 ` [PATCH 04/11] cpus: Proper range-checking for -icount shift=N Markus Armbruster
2020-04-20  8:32 ` [PATCH 05/11] arm/virt: Fix virt_machine_device_plug_cb() error API violation Markus Armbruster
2020-04-20  8:52   ` Philippe Mathieu-Daudé
2020-04-20  8:32 ` [PATCH 06/11] fdc: Fix fallback=auto error handling Markus Armbruster
2020-04-20  8:54   ` Philippe Mathieu-Daudé
2020-04-20  8:32 ` [PATCH 07/11] bochs-display: Fix vgamem=SIZE " Markus Armbruster
2020-04-20  8:54   ` Philippe Mathieu-Daudé
2020-04-20  8:32 ` [PATCH 08/11] virtio-net: Fix duplex=... and speed=... " Markus Armbruster
2020-04-20  9:04   ` Philippe Mathieu-Daudé
2020-04-20  8:32 ` [PATCH 09/11] xen/pt: Fix flawed conversion to realize() Markus Armbruster
2020-04-20  8:58   ` Paul Durrant
2020-04-20  8:32 ` [PATCH 10/11] io: Fix qio_channel_socket_close() error handling Markus Armbruster
2020-04-20  9:34   ` Daniel P. Berrangé
2020-04-20  8:32 ` [PATCH 11/11] migration/colo: Fix qmp_xen_colo_do_checkpoint() " Markus Armbruster
2020-04-20  8:48   ` Zhanghailiang
2020-04-20  8:56   ` Philippe Mathieu-Daudé
2020-04-21  0:24   ` Zhang, Chen
2020-04-20 12:57 ` [PATCH 00/11] Miscellaneous error handling fixes no-reply

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=20200420083236.19309-3-armbru@redhat.com \
    --to=armbru@redhat.com \
    --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).