[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/10] parallels: Incorrect data end calculation in parallels_ope
From: |
Alexander Ivanov |
Subject: |
[PATCH 02/10] parallels: Incorrect data end calculation in parallels_open |
Date: |
Wed, 17 Aug 2022 17:53:53 +0200 |
The BDRVParallelsState structure contains data_end field that
is measured in sectors.
In parallels_open() initially this field is set by data_off field from
parallels image header.
According to the parallels format documentation,
data_off field contains an offset, in sectors, from the start of the file
to the start of the data area.
For "WithoutFreeSpace" images: if data_off is zero,
the offset is calculated as the end of the BAT table
plus some padding to ensure sector size alignment.
The parallels_open() function has code for handling zero value in data_off,
but in the result data_end contains the offset in bytes.
Replace the alignment to sector size by division by sector size.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
---
block/parallels.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/parallels.c b/block/parallels.c
index c42c955075..ce04a4da71 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -850,7 +850,8 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
}
s->data_end = le32_to_cpu(ph.data_off);
if (s->data_end == 0) {
- s->data_end = ROUND_UP(bat_entry_off(s->bat_size), BDRV_SECTOR_SIZE);
+ s->data_end = DIV_ROUND_UP(bat_entry_off(s->bat_size),
+ BDRV_SECTOR_SIZE);
}
if (s->data_end < s->header_size) {
/* there is not enough unused space to fit to block align between BAT
--
2.34.1
- [PATCH 00/10] parallels: Add duplication check, refactor, fix bugs, Alexander Ivanov, 2022/08/17
- [PATCH 02/10] parallels: Incorrect data end calculation in parallels_open,
Alexander Ivanov <=
- [PATCH 01/10] parallels: Incorrect condition in out-of-image check, Alexander Ivanov, 2022/08/17
- [PATCH 03/10] parallels: Create parallels_handle_leak() to truncate excess clusters, Alexander Ivanov, 2022/08/17
- [PATCH 04/10] parallels: Add checking and repairing duplicate offsets in BAT, Alexander Ivanov, 2022/08/17
- [PATCH 05/10] parallels: Use highest_offset() helper in leak check, Alexander Ivanov, 2022/08/17
- [PATCH 10/10] iotests: Fix cluster size in parallels images tests (131), Alexander Ivanov, 2022/08/17
- [PATCH 07/10] iotests: Add leak check test for parallels format, Alexander Ivanov, 2022/08/17
- [PATCH 06/10] iotests: Add out-of-image check test for parallels format, Alexander Ivanov, 2022/08/17
- [PATCH 08/10] iotests: Add test for BAT entries duplication check, Alexander Ivanov, 2022/08/17
- [PATCH 09/10] iotests: Refactor tests of parallels images checks (131), Alexander Ivanov, 2022/08/17