summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2015-01-12 12:31:32 +0000
committerKevin Wolf <kwolf@redhat.com>2015-02-06 17:24:21 +0100
commit0adfa1ed655904d5bf17fe047635a563f0229789 (patch)
tree9a3a00b75a5239f5fef4202d008e67ad5e5729ec
parent177b75104da3e3a9af84975c32a44782d903c41f (diff)
downloadfocaccia-qemu-0adfa1ed655904d5bf17fe047635a563f0229789.tar.gz
focaccia-qemu-0adfa1ed655904d5bf17fe047635a563f0229789.zip
qed: check for header size overflow
Header size is denoted in clusters.  The maximum cluster size is 64 MB
but there is no limit on header size.  Check for uint32_t overflow in
case the header size field has a whacky value.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1421065893-18875-2-git-send-email-stefanha@redhat.com
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/qed.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/block/qed.c b/block/qed.c
index 80f18d82e2..892b13c806 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -440,6 +440,11 @@ static int bdrv_qed_open(BlockDriverState *bs, QDict *options, int flags,
     s->l2_mask = s->table_nelems - 1;
     s->l1_shift = s->l2_shift + ffs(s->table_nelems) - 1;
 
+    /* Header size calculation must not overflow uint32_t */
+    if (s->header.header_size > UINT32_MAX / s->header.cluster_size) {
+        return -EINVAL;
+    }
+
     if ((s->header.features & QED_F_BACKING_FILE)) {
         if ((uint64_t)s->header.backing_filename_offset +
             s->header.backing_filename_size >