[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/6] qemu-img: validate image length in img_map
From: |
Eric Blake |
Subject: |
[PULL 3/6] qemu-img: validate image length in img_map |
Date: |
Mon, 18 May 2020 11:32:15 -0500 |
From: Eyal Moscovici <address@hidden>
The code handles this case correctly: we merely skip the loop. However it
is probably best to return an explicit error.
Reviewed-by: Eric Blake <address@hidden>
Acked-by: Mark Kanda <address@hidden>
Signed-off-by: Eyal Moscovici <address@hidden>
Message-Id: <address@hidden>
[eblake: commit message tweak]
Signed-off-by: Eric Blake <address@hidden>
---
qemu-img.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/qemu-img.c b/qemu-img.c
index 5d824fc15f39..c88f412333ec 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3092,6 +3092,11 @@ static int img_map(int argc, char **argv)
}
length = blk_getlength(blk);
+ if (length < 0) {
+ error_report("Failed to get size for '%s'", filename);
+ return 1;
+ }
+
while (curr.start + curr.length < length) {
int64_t offset = curr.start + curr.length;
int64_t n;
--
2.26.2
- [PULL 0/6] NBD patches for 2020-05-18, Eric Blake, 2020/05/18
- [PULL 4/6] qemu-img: refactor dump_map_entry JSON format output, Eric Blake, 2020/05/18
- [PULL 5/6] qemu-img: Add --start-offset and --max-length to map, Eric Blake, 2020/05/18
- [PULL 6/6] iotests: Enhance 223 to cover qemu-img map improvements, Eric Blake, 2020/05/18
- [PULL 1/6] qemu-nbd: Close inherited stderr, Eric Blake, 2020/05/18
- [PULL 3/6] qemu-img: validate image length in img_map,
Eric Blake <=
- [PULL 2/6] qemu_img: add cvtnum_full to print error reports, Eric Blake, 2020/05/18
- Re: [PULL 0/6] NBD patches for 2020-05-18, Eric Blake, 2020/05/18
- Re: [PULL 0/6] NBD patches for 2020-05-18, Peter Maydell, 2020/05/19