[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 01/11] parallels: Out of image offset in BAT leads to image in
From: |
Alexander Ivanov |
Subject: |
[PATCH v8 01/11] parallels: Out of image offset in BAT leads to image inflation |
Date: |
Sun, 15 Jan 2023 16:58:11 +0100 |
data_end field in BDRVParallelsState is set to the biggest offset present
in BAT. If this offset is outside of the image, any further write
will create the cluster at this offset and/or the image will be truncated
to this offset on close. This is definitely not correct.
Raise an error in parallels_open() if data_end points outside the image
and it is not a check (let the check to repaire the image).
Set data_end to the end of the cluster with the last correct offset.
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
Reviewed-by: Denis V. Lunev <den@openvz.org>
---
block/parallels.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/block/parallels.c b/block/parallels.c
index bbea2f2221..4af68adc61 100644
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -732,6 +732,7 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
BDRVParallelsState *s = bs->opaque;
ParallelsHeader ph;
int ret, size, i;
+ int64_t file_size;
QemuOpts *opts = NULL;
Error *local_err = NULL;
char *buf;
@@ -741,6 +742,12 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
return ret;
}
+ file_size = bdrv_getlength(bs->file->bs);
+ if (file_size < 0) {
+ return -EINVAL;
+ }
+ file_size >>= BDRV_SECTOR_BITS;
+
ret = bdrv_pread(bs->file, 0, sizeof(ph), &ph, 0);
if (ret < 0) {
goto fail;
@@ -805,6 +812,16 @@ static int parallels_open(BlockDriverState *bs, QDict
*options, int flags,
for (i = 0; i < s->bat_size; i++) {
int64_t off = bat2sect(s, i);
+ if (off >= file_size) {
+ if (flags & BDRV_O_CHECK) {
+ continue;
+ }
+ error_setg(errp, "parallels: Offset %" PRIi64 " in BAT[%d] entry "
+ "is larger than file size (%" PRIi64 ")",
+ off, i, file_size);
+ ret = -EINVAL;
+ goto fail;
+ }
if (off >= s->data_end) {
s->data_end = off + s->tracks;
}
--
2.34.1
- [PATCH v8 00/11] parallels: Refactor the code of images checks and fix a bug, Alexander Ivanov, 2023/01/15
- [PATCH v8 02/11] parallels: Fix high_off calculation in parallels_co_check(), Alexander Ivanov, 2023/01/15
- [PATCH v8 01/11] parallels: Out of image offset in BAT leads to image inflation,
Alexander Ivanov <=
- [PATCH v8 03/11] parallels: Fix data_end after out-of-image check, Alexander Ivanov, 2023/01/15
- [PATCH v8 04/11] parallels: create parallels_set_bat_entry_helper() to assign BAT value, Alexander Ivanov, 2023/01/15
- [PATCH v8 06/11] parallels: Move check of unclean image to a separate function, Alexander Ivanov, 2023/01/15
- [PATCH v8 10/11] parallels: Replace qemu_co_mutex_lock by WITH_QEMU_LOCK_GUARD, Alexander Ivanov, 2023/01/15
- [PATCH v8 08/11] parallels: Move check of leaks to a separate function, Alexander Ivanov, 2023/01/15
- [PATCH v8 09/11] parallels: Move statistic collection to a separate function, Alexander Ivanov, 2023/01/15
- [PATCH v8 05/11] parallels: Use generic infrastructure for BAT writing in parallels_co_check(), Alexander Ivanov, 2023/01/15
- [PATCH v8 07/11] parallels: Move check of cluster outside image to a separate function, Alexander Ivanov, 2023/01/15