From: Tomáš Golembiovský <tgolembi@redhat.com>
Date: Wed, 5 Oct 2016 21:40:20 +0000 (+0200)
Subject: qemu-nbd: Shrink image size by specified offset
X-Git-Tag: qemu-xen-4.9.0-rc1~148^2~13
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e424b6550f486b2a9ab32b13c3824021199bac54;p=qemu-xen.git

qemu-nbd: Shrink image size by specified offset

When --offset is set the apparent device size has to be adjusted
accordingly. Otherwise client may request read/write beyond the file end
which would fail.

Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
Message-Id: <8a31654cb182932db78b95aae1e904fc2bd1c465.1475698895.git.tgolembi@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 99297a556f..705b95ec29 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -901,6 +901,14 @@ int main(int argc, char **argv)
         exit(EXIT_FAILURE);
     }
 
+    if (dev_offset >= fd_size) {
+        error_report("Offset (%lld) has to be smaller than the image size "
+                     "(%lld)",
+                     (long long int)dev_offset, (long long int)fd_size);
+        exit(EXIT_FAILURE);
+    }
+    fd_size -= dev_offset;
+
     if (partition != -1) {
         ret = find_partition(blk, partition, &dev_offset, &fd_size);
         if (ret < 0) {