yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-raw-posix-Fix-raw_co_get_block_status-after-EOF.patch

958e1b
From d058befe667eb24da6884a78efc23443dd9de566 Mon Sep 17 00:00:00 2001
09b1b5
From: Max Reitz <mreitz@redhat.com>
09b1b5
Date: Tue, 18 Nov 2014 15:30:17 +0100
958e1b
Subject: [PATCH 38/41] raw-posix: Fix raw_co_get_block_status() after EOF
09b1b5
09b1b5
Message-id: <1416324620-16229-5-git-send-email-mreitz@redhat.com>
09b1b5
Patchwork-id: 62439
09b1b5
O-Subject: [RHEL-7.1/7.0.z qemu-kvm PATCH v3 4/7] raw-posix: Fix raw_co_get_block_status() after EOF
958e1b
Bugzilla: 1160237
09b1b5
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
09b1b5
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
09b1b5
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
09b1b5
09b1b5
As its comment states, raw_co_get_block_status() should unconditionally
09b1b5
return 0 and set *pnum to 0 for after EOF.
09b1b5
09b1b5
An assertion after lseek(..., SEEK_HOLE) tried to catch this case by
09b1b5
asserting that errno != -ENXIO (which would indicate a position after
09b1b5
the EOF); but it should be errno != ENXIO instead. Regardless of that,
09b1b5
there should be no such assertion at all. If bdrv_getlength() returned
09b1b5
an outdated value and the image has been resized outside of qemu,
09b1b5
lseek() will return with errno == ENXIO. Just return that value as an
09b1b5
error then.
09b1b5
09b1b5
Setting *pnum to 0 and returning 0 should not be done here, as in that
09b1b5
case we should update the device length as well. So, from qemu's
09b1b5
perspective, the file has not been resized; it's just that there was an
09b1b5
error querying sectors beyond a certain point (the actual file size).
09b1b5
09b1b5
Additionally, nb_sectors should be clamped against the image end. This
09b1b5
was probably not an issue if FIEMAP or SEEK_HOLE/SEEK_DATA worked, but
09b1b5
the fallback did not take this case into account.
09b1b5
09b1b5
Reported-by: Kevin Wolf <kwolf@redhat.com>
09b1b5
Signed-off-by: Max Reitz <mreitz@redhat.com>
09b1b5
Reviewed-by: Eric Blake <eblake@redhat.com>
09b1b5
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
09b1b5
Message-id: 1414148280-17949-2-git-send-email-mreitz@redhat.com
09b1b5
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
09b1b5
(cherry picked from commit e6d7ec32dd315422a023ed3425fe36df8c274eeb)
09b1b5
09b1b5
Signed-off-by: Max Reitz <mreitz@redhat.com>
09b1b5
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
09b1b5
---
09b1b5
 block/raw-posix.c | 14 ++++++++++----
09b1b5
 1 file changed, 10 insertions(+), 4 deletions(-)
09b1b5
09b1b5
diff --git a/block/raw-posix.c b/block/raw-posix.c
958e1b
index 781ebf3..75a81b1 100644
09b1b5
--- a/block/raw-posix.c
09b1b5
+++ b/block/raw-posix.c
958e1b
@@ -1362,10 +1362,6 @@ static int64_t try_seek_hole(BlockDriverState *bs, off_t start, off_t *data,
09b1b5
 
09b1b5
     *hole = lseek(s->fd, start, SEEK_HOLE);
09b1b5
     if (*hole == -1) {
09b1b5
-        /* -ENXIO indicates that sector_num was past the end of the file.
09b1b5
-         * There is a virtual hole there.  */
09b1b5
-        assert(errno != -ENXIO);
09b1b5
-
09b1b5
         return -errno;
09b1b5
     }
09b1b5
 
958e1b
@@ -1405,6 +1401,7 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
09b1b5
                                                     int nb_sectors, int *pnum)
09b1b5
 {
09b1b5
     off_t start, data = 0, hole = 0;
09b1b5
+    int64_t total_size;
09b1b5
     int64_t ret;
09b1b5
 
09b1b5
     ret = fd_open(bs);
958e1b
@@ -1413,6 +1410,15 @@ static int64_t coroutine_fn raw_co_get_block_status(BlockDriverState *bs,
09b1b5
     }
09b1b5
 
09b1b5
     start = sector_num * BDRV_SECTOR_SIZE;
09b1b5
+    total_size = bdrv_getlength(bs);
09b1b5
+    if (total_size < 0) {
09b1b5
+        return total_size;
09b1b5
+    } else if (start >= total_size) {
09b1b5
+        *pnum = 0;
09b1b5
+        return 0;
09b1b5
+    } else if (start + nb_sectors * BDRV_SECTOR_SIZE > total_size) {
09b1b5
+        nb_sectors = DIV_ROUND_UP(total_size - start, BDRV_SECTOR_SIZE);
09b1b5
+    }
09b1b5
 
09b1b5
     ret = try_seek_hole(bs, start, &data, &hole, pnum);
09b1b5
     if (ret < 0) {
09b1b5
-- 
09b1b5
1.8.3.1
09b1b5