aboutsummaryrefslogtreecommitdiff
path: root/block/blkdebug.c
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2017-06-13 19:20:05 +0200
committerMax Reitz <mreitz@redhat.com>2017-06-26 14:54:46 +0200
commitde81d72d3d13a19edf4d461be3b0f5a877be0234 (patch)
treebe5a99c8ebeaa7f635e1bee248444e9b92dacc0e /block/blkdebug.c
parent4172a00373b2c81374293becc02b16b7f8c76659 (diff)
downloadqemu-de81d72d3d13a19edf4d461be3b0f5a877be0234.zip
qemu-de81d72d3d13a19edf4d461be3b0f5a877be0234.tar.gz
qemu-de81d72d3d13a19edf4d461be3b0f5a877be0234.tar.bz2
blkdebug: Catch bs->exact_filename overflow
The bs->exact_filename field may not be sufficient to store the full blkdebug 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-2-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>
Diffstat (limited to 'block/blkdebug.c')
-rw-r--r--block/blkdebug.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/block/blkdebug.c b/block/blkdebug.c
index 6431962..a1b24b9 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -839,9 +839,13 @@ static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)
}
if (!force_json && bs->file->bs->exact_filename[0]) {
- snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "blkdebug:%s:%s", s->config_file ?: "",
- bs->file->bs->exact_filename);
+ int ret = snprintf(bs->exact_filename, sizeof(bs->exact_filename),
+ "blkdebug:%s:%s", s->config_file ?: "",
+ bs->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;
+ }
}
opts = qdict_new();