29 lines
899 B
Diff
29 lines
899 B
Diff
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Wed, 26 Mar 2014 13:05:53 +0100
|
|
Subject: [PATCH] qcow2: Fix new L1 table size check (CVE-2014-0143)
|
|
|
|
The size in bytes is assigned to an int later, so check that instead of
|
|
the number of entries.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
(cherry picked from commit cab60de930684c33f67d4e32c7509b567f8c445b)
|
|
---
|
|
block/qcow2-cluster.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
|
|
index 09abbf0..06e3e14 100644
|
|
--- a/block/qcow2-cluster.c
|
|
+++ b/block/qcow2-cluster.c
|
|
@@ -54,7 +54,7 @@ int qcow2_grow_l1_table(BlockDriverState *bs, uint64_t min_size,
|
|
}
|
|
}
|
|
|
|
- if (new_l1_size > INT_MAX) {
|
|
+ if (new_l1_size > INT_MAX / sizeof(uint64_t)) {
|
|
return -EFBIG;
|
|
}
|
|
|