From: Markus Armbruster <armbru@redhat.com>
Date: Mon, 6 Mar 2017 19:00:40 +0000 (+0100)
Subject: sheepdog: Don't truncate long VDI name in _open(), _create()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=daa0b0d4b17d25d7d46326bac8efa449300e3711;p=qemu.git

sheepdog: Don't truncate long VDI name in _open(), _create()

sd_parse_uri() truncates long VDI names silently.  Reject them
instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/block/sheepdog.c b/block/sheepdog.c
index d3d373196c..fed7264cec 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -985,7 +985,10 @@ static int sd_parse_uri(BDRVSheepdogState *s, const char *filename,
         ret = -EINVAL;
         goto out;
     }
-    pstrcpy(vdi, SD_MAX_VDI_LEN, uri->path + 1);
+    if (g_strlcpy(vdi, uri->path + 1, SD_MAX_VDI_LEN) >= SD_MAX_VDI_LEN) {
+        ret = -EINVAL;
+        goto out;
+    }
 
     qp = query_params_parse(uri->query);
     if (qp->n > 1 || (s->is_unix && !qp->n) || (!s->is_unix && qp->n)) {