qcow2: Fix access after end of array
PATCH 1/1 qcow2: Fix access after end of array
If a write requests crosses a L2 table boundary and all clusters until the end of the L2 table are usable for the request, we must not look at the next L2 entry because we already have arrived at the end of the array.
Signed-off-by Kevin Wolf <[email protected]>
--- block/qcow2-cluster.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
block/qcow2-cluster.c +6 -2
@@ -750,12 +750,15 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,while (i < nb_clusters) { i +=count_contiguous_clusters (nb_clusters - i, s->cluster_size, &l2_table[l2_index], i,0 ); - -if (be64_to_cpu (l2_table[l2_index + i])) +if ((i >= nb_clusters) ||be64_to_cpu (l2_table[l2_index + i])) {break ; + } i +=count_contiguous_free_clusters (nb_clusters - i, &l2_table[l2_index + i]); +if (i >= nb_clusters) { +break ; + } cluster_offset =be64_to_cpu (l2_table[l2_index + i]);
@@ -763,6 +766,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, (cluster_offset & QCOW_OFLAG_COMPRESSED))break ; } +assert (i <= nb_clusters); nb_clusters = i;/*
Signature · 1 line
1.6.6
Anthony Liguori
AppliedQuoted 6 lines · Kevin Wolf
If a write requests crosses a L2 table boundary and all clusters until the end of the L2 table are usable for the request, we must not look at the next L2 entry because we already have arrived at the end of the array.
Signed-off-by Kevin Wolf<[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori
Quoted 35 lines
--- block/qcow2-cluster.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)block/qcow2-cluster.c +6
-2@@ -750,12 +750,15 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset,while (i< nb_clusters) { i +=count_contiguous_clusters (nb_clusters - i, s->cluster_size, &l2_table[l2_index], i,0 ); - -if (be64_to_cpu (l2_table[l2_index + i])) +if ((i>= nb_clusters) ||be64_to_cpu (l2_table[l2_index + i])) {break ; + } i +=count_contiguous_free_clusters (nb_clusters - i, &l2_table[l2_index + i]); +if (i>= nb_clusters) { +break ; + } cluster_offset =be64_to_cpu (l2_table[l2_index + i]);@@ -763,6 +766,7 @@ int qcow2_alloc_cluster_offset(BlockDriverState *bs, uint64_t offset, (cluster_offset& QCOW_OFLAG_COMPRESSED))break ; } +assert (i<= nb_clusters); nb_clusters = i;/*