aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com>2018-01-05 12:44:40 -0200
committerJeff Cody <jcody@redhat.com>2018-01-31 22:37:00 -0500
commitfbd5c4c0db47e578e3fdd88a0ebc4314a1ed3d42 (patch)
tree3f66f7ffd794de0387b67615cbd83678738d0931
parentb05631954d6dfe93340d516660397e2c1a2a5dd6 (diff)
downloadqemu-fbd5c4c0db47e578e3fdd88a0ebc4314a1ed3d42.zip
qemu-fbd5c4c0db47e578e3fdd88a0ebc4314a1ed3d42.tar.gz
qemu-fbd5c4c0db47e578e3fdd88a0ebc4314a1ed3d42.tar.bz2
block/ssh: fix possible segmentation fault when .desc is not null-terminated
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 <mreitz@redhat.com> Cc: Eric Blake <eblake@redhat.com> Signed-off-by: Murilo Opsfelder Araujo <muriloo@linux.vnet.ibm.com> Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> Signed-off-by: Jeff Cody <jcody@redhat.com>
-rw-r--r--block/ssh.c1
1 files changed, 1 insertions, 0 deletions
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 */ }
},
};