[PULL,1/2] block/ssh: fix possible segmentation fault when .desc is not null-terminated

Commit Message

Jeff Cody Feb. 1, 2018, 4:06 a.m. UTC

From: Murilo Opsfelder Araujo <[e-mail]>

This patch prevents a possible segmentation fault when .desc members are checked
against NULL.

The ssh_runtime_opts was added by commit
8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime
options").

This fix was inspired by
http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg00883.html.

Fixes: 8a6a80896d6af03b8ee0c17cdf37219eca2588a7 ("block/ssh: Use QemuOpts for runtime options")
Cc: Max Reitz <[e-mail]>
Cc: Eric Blake <[e-mail]>
Signed-off-by: Murilo Opsfelder Araujo <[e-mail]>
Reviewed-by: Eric Blake <[e-mail]>
Reviewed-by: Jeff Cody <[e-mail]>
Signed-off-by: Jeff Cody <[e-mail]>
---
 block/ssh.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/block/ssh.c b/block/ssh.c
index b049a16..8890a0c 100644
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -556,6 +556,7 @@  static QemuOptsList ssh_runtime_opts = {
             .type = QEMU_OPT_STRING,
             .help = "Defines how and what to check the host key against",
         },
+        { /* end of list */ }
     },
 };