[qemu-xen master] blkverify: Catch bs->exact_filename overflow

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

[qemu-xen master] blkverify: Catch bs->exact_filename overflow

patchbot
commit 9cbb568b5389fa1efcd4df6486aa56c3bdcc5fbf
Author:     Max Reitz <[hidden email]>
AuthorDate: Tue Jun 13 19:20:06 2017 +0200
Commit:     Anthony PERARD <[hidden email]>
CommitDate: Wed Aug 2 16:23:42 2017 +0100

    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: [hidden email]
    Reported-by: Qu Wenruo <[hidden email]>
    Signed-off-by: Max Reitz <[hidden email]>
    Message-id: [hidden email]
    Reviewed-by: Alberto Garcia <[hidden email]>
    Reviewed-by: Stefan Hajnoczi <[hidden email]>
    Signed-off-by: Max Reitz <[hidden email]>
    (cherry picked from commit 05cc758a3dfc79488d0a8eb7f5830a41871e78d0)
---
 block/blkverify.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/block/blkverify.c b/block/blkverify.c
index 9a1e21c..9a9562a 100644
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -305,10 +305,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;
+        }
     }
 }
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog
Loading...