cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-block-backend-Fix-potential-double-blk_delete.patch

26ba25
From 0fd571f772eb449da398b029705f4cadf0129f60 Mon Sep 17 00:00:00 2001
26ba25
From: Kevin Wolf <kwolf@redhat.com>
26ba25
Date: Wed, 10 Oct 2018 20:22:04 +0100
26ba25
Subject: [PATCH 38/49] block-backend: Fix potential double blk_delete()
26ba25
26ba25
RH-Author: Kevin Wolf <kwolf@redhat.com>
26ba25
Message-id: <20181010202213.7372-26-kwolf@redhat.com>
26ba25
Patchwork-id: 82615
26ba25
O-Subject: [RHEL-8 qemu-kvm PATCH 35/44] block-backend: Fix potential double blk_delete()
26ba25
Bugzilla: 1637976
26ba25
RH-Acked-by: Max Reitz <mreitz@redhat.com>
26ba25
RH-Acked-by: John Snow <jsnow@redhat.com>
26ba25
RH-Acked-by: Thomas Huth <thuth@redhat.com>
26ba25
26ba25
blk_unref() first decreases the refcount of the BlockBackend and calls
26ba25
blk_delete() if the refcount reaches zero. Requests can still be in
26ba25
flight at this point, they are only drained during blk_delete():
26ba25
26ba25
At this point, arbitrary callbacks can run. If any callback takes a
26ba25
temporary BlockBackend reference, it will first increase the refcount to
26ba25
1 and then decrease it to 0 again, triggering another blk_delete(). This
26ba25
will cause a use-after-free crash in the outer blk_delete().
26ba25
26ba25
Fix it by draining the BlockBackend before decreasing to refcount to 0.
26ba25
Assert in blk_ref() that it never takes the first refcount (which would
26ba25
mean that the BlockBackend is already being deleted).
26ba25
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Reviewed-by: Fam Zheng <famz@redhat.com>
26ba25
Reviewed-by: Max Reitz <mreitz@redhat.com>
26ba25
(cherry picked from commit 5ca9d21bd1c8eeb578d0964e31bd03d47c25773d)
26ba25
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
26ba25
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
26ba25
---
26ba25
 block/block-backend.c | 9 ++++++++-
26ba25
 1 file changed, 8 insertions(+), 1 deletion(-)
26ba25
26ba25
diff --git a/block/block-backend.c b/block/block-backend.c
26ba25
index dffc6f0..bfd0331 100644
26ba25
--- a/block/block-backend.c
26ba25
+++ b/block/block-backend.c
26ba25
@@ -436,6 +436,7 @@ int blk_get_refcnt(BlockBackend *blk)
26ba25
  */
26ba25
 void blk_ref(BlockBackend *blk)
26ba25
 {
26ba25
+    assert(blk->refcnt > 0);
26ba25
     blk->refcnt++;
26ba25
 }
26ba25
 
26ba25
@@ -448,7 +449,13 @@ void blk_unref(BlockBackend *blk)
26ba25
 {
26ba25
     if (blk) {
26ba25
         assert(blk->refcnt > 0);
26ba25
-        if (!--blk->refcnt) {
26ba25
+        if (blk->refcnt > 1) {
26ba25
+            blk->refcnt--;
26ba25
+        } else {
26ba25
+            blk_drain(blk);
26ba25
+            /* blk_drain() cannot resurrect blk, nobody held a reference */
26ba25
+            assert(blk->refcnt == 1);
26ba25
+            blk->refcnt = 0;
26ba25
             blk_delete(blk);
26ba25
         }
26ba25
     }
26ba25
-- 
26ba25
1.8.3.1
26ba25