ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Max Reitz 2017-06-13 19:20:06 +02:00
parent de81d72d3d
commit 05cc758a3d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/blkverify.c
View File

@ -301,10 +301,14 @@ static void blkverify_refresh_filename(BlockDriverState *bs, QDict *options)
if (bs->file->bs->exact_filename[0] if (bs->file->bs->exact_filename[0]
&& s->test_file->bs->exact_filename[0]) && s->test_file->bs->exact_filename[0])
{ {
snprintf(bs->exact_filename, sizeof(bs->exact_filename), int ret = snprintf(bs->exact_filename, sizeof(bs->exact_filename),
"blkverify:%s:%s", "blkverify:%s:%s",
bs->file->bs->exact_filename, bs->file->bs->exact_filename,
s->test_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;
}
} }
} }