[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 2/2] blkverify: Catch bs->exact_filename overflow
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH 2/2] blkverify: Catch bs->exact_filename overflow |
Date: |
Tue, 13 Jun 2017 19:20:06 +0200 |
The bs->exact_filename field may not be sufficient to store the full
blkverify node filename. In this case, we should not generate a filename
at all instead of an unusable one.
Cc: address@hidden
Reported-by: Qu Wenruo <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/blkverify.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/block/blkverify.c b/block/blkverify.c
index 6b0a603..06369f9 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -301,10 +301,14 @@ static void blkverify_refresh_filename(BlockDriverState
*bs, QDict *options)
if (bs->file->bs->exact_filename[0]
&& s->test_file->bs->exact_filename[0])
{
- snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "blkverify:%s:%s",
- bs->file->bs->exact_filename,
- s->test_file->bs->exact_filename);
+ int ret = snprintf(bs->exact_filename, sizeof(bs->exact_filename),
+ "blkverify:%s:%s",
+ bs->file->bs->exact_filename,
+ s->test_file->bs->exact_filename);
+ if (ret >= sizeof(bs->exact_filename)) {
+ /* An overflow makes the filename unusable, so do not report any */
+ bs->exact_filename[0] = 0;
+ }
}
}
--
2.9.4
- [Qemu-block] [PATCH 0/2] block: Fix gcc 7 warnings, Max Reitz, 2017/06/13
- [Qemu-block] [PATCH 1/2] blkdebug: Catch bs->exact_filename overflow, Max Reitz, 2017/06/13
- [Qemu-block] [PATCH 2/2] blkverify: Catch bs->exact_filename overflow,
Max Reitz <=
- Re: [Qemu-block] [Qemu-devel] [PATCH 0/2] block: Fix gcc 7 warnings, no-reply, 2017/06/13
- Re: [Qemu-block] [PATCH 0/2] block: Fix gcc 7 warnings, Alberto Garcia, 2017/06/13
- Re: [Qemu-block] [PATCH 0/2] block: Fix gcc 7 warnings, Stefan Hajnoczi, 2017/06/15
- Re: [Qemu-block] [PATCH 0/2] block: Fix gcc 7 warnings, Max Reitz, 2017/06/16