qcow2: Correct endianness in overlap check
PATCH 1/1 qcow2: Correct endianness in overlap check
If an inactive L1 table is loaded from disk, its entries are in big endian and have to be converted to host byte order before using them.
--- block/qcow2-refcount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
block/qcow2-refcount.c +2 -2
@@ -1733,8 +1733,8 @@ int qcow2_check_metadata_overlap(BlockDriverState *bs, int chk, int64_t offset, }for (j =0 ; j < l1_sz; j++) { -if ((l1[j] &L1E_OFFSET_MASK ) && -overlaps_with (l1[j] &L1E_OFFSET_MASK , s->cluster_size)) { +uint64_t l2_ofs =be64_to_cpu (l1[j]) &L1E_OFFSET_MASK ; +if (l2_ofs &&overlaps_with (l2_ofs, s->cluster_size)) {g_free (l1);return QCOW2_OL_INACTIVE_L2 ; }
Signature · 1 line
1.8.3.1
Am 30.09.2013 um 08:59 hat Max Reitz geschrieben:
Quoted 4 lines
If an inactive L1 table is loaded from disk, its entries are in big endian and have to be converted to host byte order before using them.
Signed-off-by Max Reitz <[email protected]>
Sounds like there's yet a test case missing? (But it requires the runtime options for enabling these checks, obviously)
Kevin
Quoted 9 lines · Kevin Wolf
Am 30.09.2013 um 08:59 hat Max Reitz geschrieben:
Quoted 4 lines
If an inactive L1 table is loaded from disk, its entries are in big endian and have to be converted to host byte order before using them.
Signed-off-by Max Reitz <[email protected]>Reviewed-by Kevin Wolf <[email protected]>Sounds like there's yet a test case missing? (But it requires the runtime options for enabling these checks, obviously)
Yes to both. For now, I just couldn't write such a test case.
Max
Stefan Hajnoczi
AppliedQuoted 7 lines · Max Reitz
If an inactive L1 table is loaded from disk, its entries are in big endian and have to be converted to host byte order before using them.
Signed-off-by Max Reitz <[email protected]>--- block/qcow2-refcount.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block
Stefan