From 053965c7ff5b260672719884e644ce4117d01995 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Fri, 22 Jan 2010 14:26:38 +0100 Subject: [PATCH] block/raw-posix: Abort on pread beyond end of non-growable file This shouldn't happen under any normal circumstances. However, it looks like it's possible to achieve this with corrupted images. Without this patch raw_pread is hanging in an endless loop in such cases. The patch is not affecting growable files, for which such reads happen in normal use cases. raw_pread_aligned already handles these cases and won't return zero in the first place. Signed-off-by: Kevin Wolf Signed-off-by: Anthony Liguori --- block/raw-posix.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index 96f26173ef..7ce72e9e4e 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -391,8 +391,12 @@ static int raw_pread(BlockDriverState *bs, int64_t offset, size = ALIGNED_BUFFER_SIZE; ret = raw_pread_aligned(bs, offset, s->aligned_buf, size); - if (ret < 0) + if (ret < 0) { return ret; + } else if (ret == 0) { + fprintf(stderr, "raw_pread: read beyond end of file\n"); + abort(); + } size = ret; if (size > count) -- 2.11.4.GIT