diff options
author | Max Reitz <mreitz@redhat.com> | 2017-06-13 19:20:06 +0200 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2017-08-24 16:57:05 -0500 |
commit | 21827917342bac938e462513afee6c7d39f28adc (patch) | |
tree | 5058638acd7c44bce7a06ce750442cdaf810ec60 | |
parent | 1828d47845ca92ec3fcfd82399f036526afc6a31 (diff) | |
download | qemu-21827917342bac938e462513afee6c7d39f28adc.zip qemu-21827917342bac938e462513afee6c7d39f28adc.tar.gz qemu-21827917342bac938e462513afee6c7d39f28adc.tar.bz2 |
blkverify: Catch bs->exact_filename overflow
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: qemu-stable@nongnu.org
Reported-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20170613172006.19685-3-mreitz@redhat.com
Reviewed-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
(cherry picked from commit 05cc758a3dfc79488d0a8eb7f5830a41871e78d0)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r-- | block/blkverify.c | 12 |
1 files 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; + } } } |