[qemu-xen stable-4.13] qcow2: Fix QCOW2_COMPRESSED_SECTOR_MASK

[patchbot@xxxxxxx]

commit 405deba14f6b61b9c557484b46e863308c8cf373
Author:     Max Reitz <mreitz@xxxxxxxxxx>
AuthorDate: Mon Oct 28 17:18:40 2019 +0100
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Mon Nov 11 15:40:36 2019 -0600

    qcow2: Fix QCOW2_COMPRESSED_SECTOR_MASK
    
    Masks for L2 table entries should have 64 bit.
    
    Fixes: b6c246942b14d3e0dec46a6c5868ed84e7dbea19
    Buglink: https://bugs.launchpad.net/qemu/+bug/1850000
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
    Message-id: 20191028161841.1198-2-mreitz@xxxxxxxxxx
    Reviewed-by: Alberto Garcia <berto@xxxxxxxxxx>
    Signed-off-by: Max Reitz <mreitz@xxxxxxxxxx>
    (cherry picked from commit 24552feb6ae2f615b76c2b95394af43901f75046)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 block/qcow2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/block/qcow2.h b/block/qcow2.h
index fc1b0d3c1e..359197f89f 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -77,7 +77,7 @@
 
 /* Defined in the qcow2 spec (compressed cluster descriptor) */
 #define QCOW2_COMPRESSED_SECTOR_SIZE 512U
-#define QCOW2_COMPRESSED_SECTOR_MASK (~(QCOW2_COMPRESSED_SECTOR_SIZE - 1))
+#define QCOW2_COMPRESSED_SECTOR_MASK (~(QCOW2_COMPRESSED_SECTOR_SIZE - 1ULL))
 
 /* Must be at least 2 to cover COW */
 #define MIN_L2_CACHE_SIZE 2 /* cache entries */
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.13