Skip to contentSkip to conversation

blockdev: fix missed target unref for drive-backup

PATCH Applied John Snow 2 participants 3 messages May 13, 2019 – May 22, 2019

lore
Share & tools
lore

John Snow

author
#0 lore raw

PATCH v2 1/1 blockdev: fix missed target unref for drive-backup

If the bitmap can't be used for whatever reason, we skip putting down the reference. Fix that.

In practice, this means that if you attempt to gracefully exit QEMU after a backup command being rejected, bdrv_close_all will fail and tell you some unpleasant things via assert().

---
 blockdev.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
blockdev.c +6 -7
index 79fbac8450..e856ca4be9 100644
@@ -3525,8 +3525,7 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,
     if (set_backing_hd) {
         bdrv_set_backing_hd(target_bs, source, &local_err);
         if (local_err) {
-            bdrv_unref(target_bs);
-            goto out;
+            goto unref;
         }
     }
 
@@ -3534,11 +3533,10 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,
         bmap = bdrv_find_dirty_bitmap(bs, backup->bitmap);
         if (!bmap) {
             error_setg(errp, "Bitmap '%s' could not be found", backup->bitmap);
-            bdrv_unref(target_bs);
-            goto out;
+            goto unref;
         }
         if (bdrv_dirty_bitmap_check(bmap, BDRV_BITMAP_DEFAULT, errp)) {
-            goto out;
+            goto unref;
         }
     }
     if (!backup->auto_finalize) {
@@ -3552,12 +3550,13 @@ static BlockJob *do_drive_backup(DriveBackup *backup, JobTxn *txn,
                             backup->sync, bmap, backup->compress,
                             backup->on_source_error, backup->on_target_error,
                             job_flags, NULL, NULL, txn, &local_err);
-    bdrv_unref(target_bs);
     if (local_err != NULL) {
         error_propagate(errp, local_err);
-        goto out;
+        goto unref;
     }
 
+unref:
+    bdrv_unref(target_bs);
 out:
     aio_context_release(aio_context);
     return job;
Signature · 1 line
2.20.1
author
#1 lore raw
Quoted 11 lines · John Snow

If the bitmap can't be used for whatever reason, we skip putting down the reference. Fix that.

In practice, this means that if you attempt to gracefully exit QEMU after a backup command being rejected, bdrv_close_all will fail and tell you some unpleasant things via assert().

(I assume this can go through either Kevin or Max's tree?)

Applied
#2 lore raw
In reply to John Snow

Am 13.05.2019 um 17:06 hat John Snow geschrieben:

Quoted 11 lines

If the bitmap can't be used for whatever reason, we skip putting down the reference. Fix that.

In practice, this means that if you attempt to gracefully exit QEMU after a backup command being rejected, bdrv_close_all will fail and tell you some unpleasant things via assert().

Thanks, applied to the block branch.

Kevin